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

From: Stephen Rothwell
Date: Mon Aug 03 2020 - 02:55:53 EST

Hi all,

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


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.

Stephen Rothwell

Attachment: pgpgLqCYzNei5.pgp
Description: OpenPGP digital signature