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

Hi all, On Mon, 15 Feb 2021 07:55:14 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 16:17:06 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/coredump.c > > > > between commit: > > > > 8a3cc755b138 ("coredump: don'

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

Hi all, On Mon, 15 Feb 2021 08:05:21 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 17:00:54 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/namei.c > > > > between commit: > > > > e36cffed20a3 ("fs: make unlazy_wal

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

Hi all, On Mon, 25 Jan 2021 17:00:54 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the pidfd tree got a conflict in: > > fs/namei.c > > between commit: > > e36cffed20a3 ("fs: make unlazy_walk() error handling consistent") > 1e8f44f159b3 ("do_tmpfile(): don't mess with fi

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

Hi all, On Mon, 25 Jan 2021 16:17:06 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the pidfd tree got a conflict in: > > fs/coredump.c > > between commit: > > 8a3cc755b138 ("coredump: don't bother with do_truncate()") > > from the vfs tree and commit: > > 643fe55a0679