linux-next: manual merge of the battery tree with the i2c tree

linux-next: manual merge of the battery tree with the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

Hi all,

Today's linux-next merge of the battery tree got a conflict in:

  drivers/power/supply/cw2015_battery.c

between commit:

  ed5c2f5fd10d ("i2c: Make remove callback return void")

from the i2c tree and commit:

  ed5c2f5fd10d ("i2c: Make remove callback return void")

from the battery tree.

I fixed it up (the latter removed the code modified by the former, so
I just did that) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the battery tree with the i2c tree

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]

Hello,

On Mon, Sep 12, 2022 at 01:03:44PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the battery tree got a conflict in:
> 
>   drivers/power/supply/cw2015_battery.c
> 
> between commit:
> 
>   ed5c2f5fd10d ("i2c: Make remove callback return void")
> 
> from the i2c tree and commit:
> 
>   ed5c2f5fd10d ("i2c: Make remove callback return void")
> 
> from the battery tree.

The commit from the battery tree is

	0cb172a4918e ("power: supply: cw2015: Use device managed API to simplify the code")

> I fixed it up (the latter removed the code modified by the former, so
> I just did that)

I don't see today's tag in git yet, but removing the code sounds right.

> and can carry the fix as necessary. This is now fixed as far as
> linux-next is concerned, but any non trivial conflicts should be
> mentioned to your upstream maintainer when your tree is submitted for
> merging.  You may also want to consider cooperating with the
> maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

@Sebastian: You might want to pull

	https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux i2c/make_remove_callback_void-immutable

into your tree to prepare a smooth merging experience for Linus.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the battery tree with the i2c tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 984 bytes --]

Hi Uwe,

On Mon, 12 Sep 2022 09:34:55 +0200 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>
> On Mon, Sep 12, 2022 at 01:03:44PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the battery tree got a conflict in:
> > 
> >   drivers/power/supply/cw2015_battery.c
> > 
> > between commit:
> > 
> >   ed5c2f5fd10d ("i2c: Make remove callback return void")
> > 
> > from the i2c tree and commit:
> > 
> >   ed5c2f5fd10d ("i2c: Make remove callback return void")
> > 
> > from the battery tree.  
> 
> The commit from the battery tree is
> 
> 	0cb172a4918e ("power: supply: cw2015: Use device managed API to simplify the code")

Yes, sorry, cut and paste fail :-(

> > I fixed it up (the latter removed the code modified by the former, so
> > I just did that)  
> 
> I don't see today's tag in git yet, but removing the code sounds right.

Good, and, yeah, I am still going :-)

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]