1. Patchew
  2. linux
  3. View series

[PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms

Andy Shevchenko posted 3 patches 1 year, 10 months ago
There is a newer version of this series
drivers/video/backlight/mp3309c.c | 88 ++++++++++++-------------------
1 file changed, 35 insertions(+), 53 deletions(-)
[PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Andy Shevchenko 1 year, 10 months ago 
Allow to use driver on non-OF platforms and other cleanups.

Changelog v2:
- rename pm3309c_parse_dt_node() --> mp3309c_parse_fwnode() (Daniel)
- add tags (Daniel, Flavio)
- new patch 2

Andy Shevchenko (3):
  backlight: mp3309c: Make use of device properties
  backlight: mp3309c: use dev_err_probe() instead of dev_err()
  backlight: mp3309c: Utilise temporary variable for struct device

 drivers/video/backlight/mp3309c.c | 88 ++++++++++++-------------------
 1 file changed, 35 insertions(+), 53 deletions(-)

-- 
2.43.0.rc1.1.gbec44491f096
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Lee Jones 1 year, 10 months ago 
On Thu, 01 Feb 2024 17:14:12 +0200, Andy Shevchenko wrote:
> Allow to use driver on non-OF platforms and other cleanups.
> 
> Changelog v2:
> - rename pm3309c_parse_dt_node() --> mp3309c_parse_fwnode() (Daniel)
> - add tags (Daniel, Flavio)
> - new patch 2
> 
> [...]

Applied, thanks!

[1/3] backlight: mp3309c: Make use of device properties
      commit: b6fc7e62a7afc3709b31f6779665c7fc4a7755d7
[2/3] backlight: mp3309c: use dev_err_probe() instead of dev_err()
      (no commit info)
[3/3] backlight: mp3309c: Utilise temporary variable for struct device
      (no commit info)

--
Lee Jones [李琼斯]
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Lee Jones 1 year, 10 months ago 
On Thu, 01 Feb 2024 17:14:12 +0200, Andy Shevchenko wrote:
> Allow to use driver on non-OF platforms and other cleanups.
> 
> Changelog v2:
> - rename pm3309c_parse_dt_node() --> mp3309c_parse_fwnode() (Daniel)
> - add tags (Daniel, Flavio)
> - new patch 2
> 
> [...]

Applied, thanks!

[1/3] backlight: mp3309c: Make use of device properties
      commit: e531c279ddee738260a94b2121836549ea167f63
[2/3] backlight: mp3309c: use dev_err_probe() instead of dev_err()
      commit: d991269f64928051c895151a8589dce806a92d9e
[3/3] backlight: mp3309c: Utilise temporary variable for struct device
      (no commit info)

--
Lee Jones [李琼斯]
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Lee Jones 1 year, 10 months ago 
On Thu, 01 Feb 2024, Andy Shevchenko wrote:

> Allow to use driver on non-OF platforms and other cleanups.
> 
> Changelog v2:
> - rename pm3309c_parse_dt_node() --> mp3309c_parse_fwnode() (Daniel)
> - add tags (Daniel, Flavio)
> - new patch 2
> 
> Andy Shevchenko (3):
>   backlight: mp3309c: Make use of device properties
>   backlight: mp3309c: use dev_err_probe() instead of dev_err()
>   backlight: mp3309c: Utilise temporary variable for struct device
> 
>  drivers/video/backlight/mp3309c.c | 88 ++++++++++++-------------------
>  1 file changed, 35 insertions(+), 53 deletions(-)

Set no longer applies.  Please rebase, thanks.

-- 
Lee Jones [李琼斯]
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Andy Shevchenko 1 year, 10 months ago 
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
(1) that may not be found in your tree currently.

-- 
With Best Regards,
Andy Shevchenko
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Lee Jones 1 year, 10 months ago 
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
4. I sent you a message to say that the set failed to apply
5. *** I forgot to remove the 2 successful patches ***
6. I applied another patch
7. b4 noticed the 2 patches that were applied and thanked you for them
8. *** I didn't notice that those tys were sent ***

No need to update the scripts. :)

> (1) that may not be found in your tree currently.

I'm going to remove the other ones now.  Please submit the set.

-- 
Lee Jones [李琼斯]
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Andy Shevchenko 1 year, 10 months ago 
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?

> 4. I sent you a message to say that the set failed to apply
> 5. *** I forgot to remove the 2 successful patches ***
> 6. I applied another patch
> 7. b4 noticed the 2 patches that were applied and thanked you for them
> 8. *** I didn't notice that those tys were sent ***
> 
> No need to update the scripts. :)
> 
> > (1) that may not be found in your tree currently.
> 
> I'm going to remove the other ones now.  Please submit the set.

I'll do, but I want to understand better what's going on.

-- 
With Best Regards,
Andy Shevchenko
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Lee Jones 1 year, 10 months ago 
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".

-- 
Lee Jones [李琼斯]
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Andy Shevchenko 1 year, 10 months ago 
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.

-- 
With Best Regards,
Andy Shevchenko
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Lee Jones 1 year, 10 months ago 
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 [李琼斯]
Re: [PATCH v2 0/3] backlight: mp3309c: Allow to use on non-OF platforms
Posted by Andy Shevchenko 1 year, 10 months ago 
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@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?

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

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.