linux-next: manual merge of the csky tree with Linus' tree

From: Stephen Rothwell
Date: Sun Jan 06 2019 - 18:28:17 EST

Hi Guo,

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


between commit:

7c703e54cc71 ("arch: switch the default on ARCH_HAS_SG_CHAIN")

from Linus' tree and commit:

ee8972b1ab82 ("Documentation/features: Add csky kernel features")

from the csky tree.

I fixed it up (the former removed the file, so I 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.

You want to add "select ARCH_NO_SG_CHAIN" to your Kconfig somewhere
(see the commit from Linus' tree above).

Stephen Rothwell

Attachment: pgp30hnjU1StT.pgp
Description: OpenPGP digital signature