Re: [PATCH v1 1/1] pwm: jz4740: Drop unused include

Andy Shevchenko
2026-04-21T15:00:52Z

On Tue, Apr 21, 2026 at 12:03:07PM +0200, Uwe Kleine-König wrote:
> On Mon, Apr 20, 2026 at 12:53:37PM +0300, Andy Shevchenko wrote:
> > On Sat, Mar 21, 2026 at 12:13:06AM +0200, Andy Shevchenko wrote:
> > > On Fri, Mar 20, 2026 at 11:07:55PM +0100, Andy Shevchenko wrote:
> > > > This driver includes the legacy header <linux/gpio.h> but does
> > > > not use any symbols from it. Drop the inclusion.
> > >
> > > Sorry, this is just a 1:1 copy of the previous message sent by a mistake.
> > > Use whatever you want, though, they are absolutely identical (body wise).
> >
> > Uwe, can this be applied?
>
> No it cannot:
>
> $ git checkout pwm/for-next
> ...
>
> $ b4 am ...
>
> $ git am ./20260320_andriy_shevchenko_pwm_jz4740_drop_unused_include.mbx
> Applying: pwm: jz4740: Drop unused include
> error: patch failed: drivers/pwm/pwm-jz4740.c:10
> error: drivers/pwm/pwm-jz4740.c: patch does not apply
> Patch failed at 0001 pwm: jz4740: Drop unused include
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> hint: When you have resolved this problem, run "git am --continue".
> hint: If you prefer to skip this patch, run "git am --skip" instead.
> hint: To restore the original branch and stop patching, run "git am --abort".
> hint: Disable this message with "git config advice.mergeConflict false"
>
> That is because I applied the patch from the other thread :-D
> It's commit 8ab1fc910415 ("pwm: jz4740: Drop unused include") and
> already landed in Linus' tree.

I see, thanks for pointing this out, seems like an outdated email in my pending
mailbox. And thanks for applying that!

--
With Best Regards,
Andy Shevchenko