Re: linux-next: manual merge of the set_fs tree with the powerpc tree

Hi Christoph, On Mon, 10 Aug 2020 08:11:06 +0200 Christoph Hellwig wrote: > > please drop my set_fs tree from linux-next. It is not going to be > merged for 5.9 in this form. OK, done from tomorrow. -- Cheers, Stephen Rothwell pgpxA4T6L9eP2.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the set_fs tree with the powerpc tree

Hi Stephen, please drop my set_fs tree from linux-next. It is not going to be merged for 5.9 in this form. Thanks!

Re: linux-next: manual merge of the set_fs tree with the powerpc tree

Hi all, On Fri, 17 Jul 2020 19:09:31 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the set_fs tree got a conflict in: > > arch/powerpc/mm/numa.c > > between commit: > > c30f931e891e ("powerpc/numa: remove ability to enable topology updates") > > from the powerpc tree

linux-next: manual merge of the set_fs tree with the powerpc tree

Hi all, Today's linux-next merge of the set_fs tree got a conflict in: arch/powerpc/mm/numa.c between commit: c30f931e891e ("powerpc/numa: remove ability to enable topology updates") from the powerpc tree and commit: 16a04bde8169 ("proc: switch over direct seq_read method calls to