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

Hi all, On Mon, 15 Feb 2021 08:14:39 +1100 Stephen Rothwell wrote: > > On Wed, 27 Jan 2021 10:00:38 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the fscache tree got a conflict in: > > > > include/linux/fs.h > > > > between commit: > > > > ba73d98745be ("namei:

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

Hi all, On Wed, 27 Jan 2021 10:00:38 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the fscache tree got a conflict in: > > include/linux/fs.h > > between commit: > > ba73d98745be ("namei: handle idmapped mounts in may_*() helpers") > > from the pidfd tree and commit: >

linux-next: manual merge of the fscache tree with the pidfd tree

Hi all, Today's linux-next merge of the fscache tree got a conflict in: include/linux/fs.h between commit: ba73d98745be ("namei: handle idmapped mounts in may_*() helpers") from the pidfd tree and commit: 0de0bdfa19fa ("vfs: Export rw_verify_area() for use by cachefiles") from the