Re: [PATCH v2 00/11] pinctrl: apple: misc fixes from post-commit review
From: Joey Gouly <joey.gouly@arm.com>
Date: 2021-11-26 22:32:55
Hi, On Fri, Nov 26, 2021 at 01:53:13AM +0100, Linus Walleij wrote:
On Mon, Nov 22, 2021 at 1:15 AM Linus Walleij [off-list ref] wrote:quoted
I tried to apply this on the pinctrl tree based on v5.16-rc1, have you tested this? It didn't work for me :(Still doesn't work. Please try on top of this branch: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=devel This happens: $ git am --signoff ./v2_20211121_joey_gouly_pinctrl_apple_misc_fixes_from_post_commit_review.mbx Applying: pinctrl: apple: fix some formatting issues error: patch failed: drivers/pinctrl/pinctrl-apple-gpio.c:249 error: drivers/pinctrl/pinctrl-apple-gpio.c: patch does not apply Patch failed at 0001 pinctrl: apple: fix some formatting issues hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". Trying manually: $ patch -p1 < ./v2_20211121_joey_gouly_pinctrl_apple_misc_fixes_from_post_commit_review.mbx patching file drivers/pinctrl/pinctrl-apple-gpio.c Hunk #9 succeeded at 243 with fuzz 1. Hunk #10 FAILED at 269. Hunk #12 FAILED at 299. 2 out of 13 hunks FAILED -- saving rejects to file drivers/pinctrl/pinctrl-apple-gpio.c.rej What am I doing wrong?
Sorry, I see the problem now. I thought you were appling the patches on top of: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/log/?h=for-next Which has the commit by Sven (9b3b94e9eb14a "pinctrl: apple: Always return valid type in apple_gpio_irq_type"). I can rebase onto devel, but you will get a (trivial) conflict when merging devel and for-next. If that's fine, let me know and I will send a v3 based on devel. Thanks, Joey
Yours, Linus Walleij