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

2021-02-21 Thread Stephen Rothwell
Hi all, On Mon, 15 Feb 2021 09:41:31 +1100 Stephen Rothwell wrote: > > On Mon, 8 Feb 2021 10:33:48 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the xfs tree got a conflict in: > > > > fs/xfs/xfs_ioctl.c > > > > between commit: > > > > f736d93d76d3 ("xfs: support i

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

2021-02-14 Thread Darrick J. Wong
On Mon, Feb 15, 2021 at 09:41:31AM +1100, Stephen Rothwell wrote: > Hi all, > > On Mon, 8 Feb 2021 10:33:48 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the xfs tree got a conflict in: > > > > fs/xfs/xfs_ioctl.c > > > > between commit: > > > > f736d93d76d3 ("xfs: su

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

2021-02-14 Thread Stephen Rothwell
Hi all, On Mon, 8 Feb 2021 10:33:48 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the xfs tree got a conflict in: > > fs/xfs/xfs_ioctl.c > > between commit: > > f736d93d76d3 ("xfs: support idmapped mounts") > > from the pidfd tree and commit: > > 7317a03df703 ("xfs: re

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

2021-02-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the xfs tree got a conflict in: fs/xfs/xfs_ioctl.c between commit: f736d93d76d3 ("xfs: support idmapped mounts") from the pidfd tree and commit: 7317a03df703 ("xfs: refactor inode ownership change transaction/inode/quota allocation idiom") from the