From: Lee Jones <lee@kernel.org>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Flavio Suligoi <f.suligoi@asem.it>,
dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Daniel Thompson <daniel.thompson@linaro.org>,
Jingoo Han <jingoohan1@gmail.com>, Helge Deller <deller@gmx.de>
Subject: Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Date: Fri, 9 Feb 2024 07:50:52 +0000 [thread overview]
Message-ID: <20240209075052.GB689448@google.com> (raw)
In-Reply-To: <ZcUcRlcQmQG4s42k@smile.fi.intel.com>
On Thu, 08 Feb 2024, Andy Shevchenko wrote:
> On Thu, Feb 08, 2024 at 06:14:55PM +0000, Lee Jones wrote:
> > On Thu, 08 Feb 2024, Andy Shevchenko wrote:
> > > On Thu, Feb 08, 2024 at 05:39:46PM +0000, Lee Jones wrote:
> > > > On Thu, 08 Feb 2024, Andy Shevchenko wrote:
> > > > > On Thu, Feb 08, 2024 at 11:34:25AM +0000, Lee Jones wrote:
> > > > > > On Thu, 01 Feb 2024, Andy Shevchenko wrote:
>
> ...
>
> > > > > > > backlight: mp3309c: Utilise temporary variable for struct device
> > > > >
> > > > > (1)
> > > > >
> > > > > > Set no longer applies. Please rebase, thanks.
> > > > >
> > > > > I got a contradictory messages:
> > > > > 1) email that says that all had been applied;
> > > > > 2) this email (that tells the complete opposite);
> > > > > 3) the repository where the first two were applied.
> > > > >
> > > > > While you can amend your scripts, I think I need to rebase only the last patch
> > > >
> > > > This is what I assume happened:
> > > >
> > > > 1. Attempted to apply the set (as a set)
> > > > 2. 2 commits applied cleanly
> > > > 3. The final commit conflicted
> > >
> > > Which is really strange. I have just applied (with b4) on top of your changes
> > > and no complains so far.
> > >
> > > $ git am ./v2_20240201_andriy_shevchenko_backlight_mp3309c_allow_to_use_on_non_of_platforms.mbx
> > > Applying: backlight: mp3309c: Make use of device properties
> > > Applying: backlight: mp3309c: use dev_err_probe() instead of dev_err()
> > > Applying: backlight: mp3309c: Utilise temporary variable for struct device
> > >
> > > Can you show what b4 tells you about this?
> >
> > Fetching patch(es)
> > Analyzing 14 messages in the thread
> > Checking attestation on all messages, may take a moment...
> > ---
> > ✓ [PATCH v2 1/3] backlight: mp3309c: Make use of device properties
> > + Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> (✓ DKIM/linaro.org)
> > + Link: https://lore.kernel.org/r/20240201151537.367218-2-andriy.shevchenko@linux.intel.com
> > + Signed-off-by: Lee Jones <lee@kernel.org>
> > ✓ [PATCH v2 2/3] backlight: mp3309c: use dev_err_probe() instead of dev_err()
> > + Tested-by: Flavio Suligoi <f.suligoi@asem.it> (✗ DKIM/asem.it)
> > + Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> (✓ DKIM/linaro.org)
> > + Link: https://lore.kernel.org/r/20240201151537.367218-3-andriy.shevchenko@linux.intel.com
> > + Signed-off-by: Lee Jones <lee@kernel.org>
> > ✓ [PATCH v2 3/3] backlight: mp3309c: Utilise temporary variable for struct device
> > + Link: https://lore.kernel.org/r/20240201151537.367218-4-andriy.shevchenko@linux.intel.com
> > + Signed-off-by: Lee Jones <lee@kernel.org>
> > ---
> > ✓ Signed: DKIM/intel.com (From: andriy.shevchenko@linux.intel.com)
> > ---
> > Total patches: 3
> > Prepared a fake commit range for 3-way merge (672ecc5199b5..d507b9f4c5b9)
> > ---
> > Link: https://lore.kernel.org/r/20240201151537.367218-1-andriy.shevchenko@linux.intel.com
> > Base: not specified
> >
> > Running through checkpatch.pl
> > total: 0 errors, 0 warnings, 103 lines checked
> >
> > "[PATCH v2 1/3] backlight: mp3309c: Make use of device properties" has no obvious style problems and is ready for submission.
> > total: 0 errors, 0 warnings, 41 lines checked
> >
> > "[PATCH v2 2/3] backlight: mp3309c: use dev_err_probe() instead of" has no obvious style problems and is ready for submission.
> > total: 0 errors, 0 warnings, 81 lines checked
> >
> > "[PATCH v2 3/3] backlight: mp3309c: Utilise temporary variable for" has no obvious style problems and is ready for submission.
> >
> > Check the results (hit return to continue or Ctrl+c to exit)
> >
> >
> > Applying patch(es)
> > Applying: backlight: mp3309c: Make use of device properties
> > Applying: backlight: mp3309c: use dev_err_probe() instead of dev_err()
> > Applying: backlight: mp3309c: Utilise temporary variable for struct device
> > Using index info to reconstruct a base tree...
> > M drivers/video/backlight/mp3309c.c
> > Checking patch drivers/video/backlight/mp3309c.c...
> > Applied patch drivers/video/backlight/mp3309c.c cleanly.
> > Falling back to patching base and 3-way merge...
> > error: Your local changes to the following files would be overwritten by merge:
> > drivers/video/backlight/mp3309c.c
> > Please commit your changes or stash them before you merge.
> > Aborting
> > error: Failed to merge in the changes.
> > Patch failed at 0003 backlight: mp3309c: Utilise temporary variable for struct device
> > hint: Use 'git am --show-current-patch=diff' to see the failed patch
> > When you have resolved this problem, run "git am --continue".
> > If you prefer to skip this patch, run "git am --skip" instead.
> > To restore the original branch and stop patching, run "git am --abort".
>
> Thank you!
>
> It seems I have reduced context, so if you do `git am -C2 ...` it should apply.
> Never mind, I'll send a new version which should work with -C3.
I just use the default matching context lines.
Do you have a special config that reduces you context in patches?
--
Lee Jones [李琼斯]
next prev parent reply other threads:[~2024-02-09 7:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-01 15:14 [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms Andy Shevchenko
2024-02-01 15:14 ` [PATCH v2 1/3] backlight: mp3309c: Make use of device properties Andy Shevchenko
2024-02-02 10:28 ` Daniel Thompson
2024-02-01 15:14 ` [PATCH v2 2/3] backlight: mp3309c: use dev_err_probe() instead of dev_err() Andy Shevchenko
2024-02-02 10:28 ` Daniel Thompson
2024-02-02 10:48 ` Flavio Suligoi
2024-02-01 15:14 ` [PATCH v2 3/3] backlight: mp3309c: Utilise temporary variable for struct device Andy Shevchenko
2024-02-02 10:52 ` [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms Flavio Suligoi
2024-02-02 14:18 ` Andy Shevchenko
2024-02-08 11:34 ` Lee Jones
2024-02-08 17:15 ` Andy Shevchenko
2024-02-08 17:39 ` Lee Jones
2024-02-08 18:07 ` Andy Shevchenko
2024-02-08 18:14 ` Lee Jones
2024-02-08 18:24 ` Andy Shevchenko
2024-02-09 7:50 ` Lee Jones [this message]
2024-02-09 14:51 ` Andy Shevchenko
2024-02-08 14:30 ` Lee Jones
2024-02-23 13:51 ` Lee Jones
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=20240209075052.GB689448@google.com \
--to=lee@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=daniel.thompson@linaro.org \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=f.suligoi@asem.it \
--cc=jingoohan1@gmail.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).