public inbox for linux-mips@vger.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Uwe Kleine-König" <ukleinek@kernel.org>
Cc: linux-mips@vger.kernel.org, linux-pwm@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Paul Cercueil <paul@crapouillou.net>
Subject: Re: [PATCH v1 1/1] pwm: jz4740: Drop unused include
Date: Tue, 21 Apr 2026 18:00:48 +0300	[thread overview]
Message-ID: <aeeRIJEToTZFa1Cg@ashevche-desk.local> (raw)
In-Reply-To: <aedJDX0ONKhgTD1k@monoceros>

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



  reply	other threads:[~2026-04-21 15:00 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-20 22:07 [PATCH v1 1/1] pwm: jz4740: Drop unused include Andy Shevchenko
2026-03-20 22:13 ` Andy Shevchenko
2026-04-20  9:53   ` Andy Shevchenko
2026-04-21 10:03     ` Uwe Kleine-König
2026-04-21 15:00       ` Andy Shevchenko [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-03-20 22:06 Andy Shevchenko
2026-03-21 14:35 ` Paul Cercueil
2026-03-21 22:45 ` Uwe Kleine-König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aeeRIJEToTZFa1Cg@ashevche-desk.local \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=paul@crapouillou.net \
    --cc=ukleinek@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox