Re: linux-next: manual merge of the nvdimm tree with the vfs tree

2020-09-24 Thread Dan Williams
[ add Ingo ] On Thu, Sep 24, 2020 at 7:10 AM Dan Williams wrote: > > On Wed, Sep 23, 2020 at 11:45 PM Stephen Rothwell > wrote: > > > > Hi all, > > > > Today's linux-next merge of the nvdimm tree got a conflict in: > > > > lib/iov_iter.c > > > > between commit: > > > > e33ea6e5ba6a ("x86/ua

Re: linux-next: manual merge of the nvdimm tree with the vfs tree

2020-09-24 Thread Dan Williams
On Wed, Sep 23, 2020 at 11:45 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the nvdimm tree got a conflict in: > > lib/iov_iter.c > > between commit: > > e33ea6e5ba6a ("x86/uaccess: Use pointer masking to limit uaccess > speculation") > > from the vfs tree and commit:

linux-next: manual merge of the nvdimm tree with the vfs tree

2020-09-23 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the nvdimm tree got a conflict in: lib/iov_iter.c between commit: e33ea6e5ba6a ("x86/uaccess: Use pointer masking to limit uaccess speculation") from the vfs tree and commit: 0a78de3d4b7b ("x86, powerpc: Rename memcpy_mcsafe() to copy_mc_to_{user, ke

linux-next: manual merge of the nvdimm tree with the vfs tree

2020-09-23 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the nvdimm tree got conflicts in: arch/x86/include/asm/uaccess_64.h between commit: e33ea6e5ba6a ("x86/uaccess: Use pointer masking to limit uaccess speculation") from the vfs tree and commit: 0a78de3d4b7b ("x86, powerpc: Rename memcpy_mcsafe() to cop

linux-next: manual merge of the nvdimm tree with the vfs tree

2017-07-02 Thread Stephen Rothwell
Hi Dan, Today's linux-next merge of the nvdimm tree got conflicts in: include/linux/uio.h lib/iov_iter.c between commit: aa28de275a24 ("iov_iter/hardening: move object size checks to inlined part") from the vfs tree and commit: 0aed55af8834 ("x86, uaccess: introduce copy_from_iter_flu