Message-ID: <ZcY8CDnUZn7SuK8-@smile.fi.intel.com>
Date: Fri, 9 Feb 2024 16:51:52 +0200
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: Lee Jones <lee@...nel.org>
Cc: Flavio Suligoi <f.suligoi@...m.it>, dri-devel@...ts.freedesktop.org,
	linux-fbdev@...r.kernel.org, linux-kernel@...r.kernel.org,
	Daniel Thompson <daniel.thompson@...aro.org>,
	Jingoo Han <jingoohan1@...il.com>, Helge Deller <deller@....de>
Subject: Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF
 platforms

On Fri, Feb 09, 2024 at 07:50:52AM +0000, Lee Jones wrote:
> 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@...aro.org> (✓ DKIM/linaro.org)
> > >     + Link: https://lore.kernel.org/r/20240201151537.367218-2-andriy.shevchenko@linux.intel.com
> > >     + Signed-off-by: Lee Jones <lee@...nel.org>
> > >   ✓ [PATCH v2 2/3] backlight: mp3309c: use dev_err_probe() instead of dev_err()
> > >     + Tested-by: Flavio Suligoi <f.suligoi@...m.it> (✗ DKIM/asem.it)
> > >     + Reviewed-by: Daniel Thompson <daniel.thompson@...aro.org> (✓ DKIM/linaro.org)
> > >     + Link: https://lore.kernel.org/r/20240201151537.367218-3-andriy.shevchenko@linux.intel.com
> > >     + Signed-off-by: Lee Jones <lee@...nel.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@...nel.org>
> > >   ---
> > >   ✓ Signed: DKIM/intel.com (From: andriy.shevchenko@...ux.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?

No special config, but can be done via aliasing (through function)
E.g.,
	git() {
		if [ "$1" = 'am' ]; then
			shift
			/usr/bin/git am -C1 "$@"
		else
			/usr/bin/git "$@"
		fi
	}

-- 
With Best Regards,
Andy Shevchenko

Powered by blists - more mailing lists