linux-next: manual merge of the char-misc tree with the powerpc tree

[Stephen Rothwell]

Hi all,

On Mon, 3 Aug 2020 16:55:46 +1000 Stephen Rothwell <sfr at canb.auug.org.au> wrote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   drivers/misc/ocxl/config.c
> 
> between commit:
> 
>   3591538a31af ("ocxl: Address kernel doc errors & warnings")
> 
> from the powerpc tree and commit:
> 
>   28fc491e9be6 ("misc: ocxl: config: Provide correct formatting to function headers")
> 
> from the char-misc tree.
> 
> I fixed it up (as it was just differences in comments, I just arbitrarily
> chose the latter version) 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.

This is now a conflict between the powerpc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20200806/9b3ec947/attachment-0001.sig>