linux-next: manual merge of the i2c tree with the i2c-host-fixes tree

linux-next: manual merge of the i2c tree with the i2c-host-fixes tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/i2c/busses/i2c-hisi.c

between commit:

  9a5adaf694f5 ("i2c: hisi: Only handle the interrupt of the driver's transfer")

from the i2c-host-fixes tree and commit:

  fff67c1b17ee ("i2c: hisi: Only handle the interrupt of the driver's transfer")

from the i2c tree.

I fixed it up (I used the latter) 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 i2c tree with the i2c-host-fixes tree

[Wolfram Sang]

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

Hi Stepehn,

> from the i2c-host-fixes tree and commit:

I think it makes sense to drop i2c-host-fixes and i2c-host from
linux-next again. Andi kindly helped out while I was on an unplanned
hiatus. But now I will populate my own branches again (with largely
pulling in Andi's branches). Thank you for the quick inclusion of his
branches and to Andi for helping out!

All the best,

   Wolfram


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

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

[Stephen Rothwell]

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

Hi Wolfram, Andi,

On Tue, 15 Aug 2023 09:12:22 +0200 Wolfram Sang <wsa@the-dreams.de> wrote:
>
> > from the i2c-host-fixes tree and commit:  
> 
> I think it makes sense to drop i2c-host-fixes and i2c-host from
> linux-next again. Andi kindly helped out while I was on an unplanned
> hiatus. But now I will populate my own branches again (with largely
> pulling in Andi's branches). Thank you for the quick inclusion of his
> branches and to Andi for helping out!

I have removed Andi's trees.  Thanks.

-- 
Cheers,
Stephen Rothwell

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