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

2019-01-07 Thread Stephen Rothwell
Hi Christoph, On Mon, 7 Jan 2019 07:53:44 +0100 Christoph Hellwig wrote: > > On Mon, Jan 07, 2019 at 10:27:27AM +1100, Stephen Rothwell wrote: > > You want to add "select ARCH_NO_SG_CHAIN" to your Kconfig somewhere > > (see the commit from Linus' tree above). > > No, csky should not select it.

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

2019-01-06 Thread Christoph Hellwig
On Mon, Jan 07, 2019 at 10:27:27AM +1100, Stephen Rothwell wrote: > You want to add "select ARCH_NO_SG_CHAIN" to your Kconfig somewhere > (see the commit from Linus' tree above). No, csky should not select it. There is no code directly poking into scatterlists internals in csky, so it can safely

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

2019-01-06 Thread Stephen Rothwell
Hi Guo, Today's linux-next merge of the csky tree got a conflict in: Documentation/features/io/sg-chain/arch-support.txt between commit: 7c703e54cc71 ("arch: switch the default on ARCH_HAS_SG_CHAIN") from Linus' tree and commit: ee8972b1ab82 ("Documentation/features: Add csky kernel fea