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

2021-02-21 Thread Stephen Rothwell
Hi all, On Mon, 15 Feb 2021 08:42:43 +1100 Stephen Rothwell wrote: > > On Wed, 27 Jan 2021 11:24:41 +1100 Stephen Rothwell > wrote: > > > > On Mon, 25 Jan 2021 17:14:14 +1100 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > > >

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

2021-02-14 Thread Stephen Rothwell
Hi all, On Wed, 27 Jan 2021 11:24:41 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 17:14:14 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/xfs/xfs_inode.c > > > > between commit: > > > > 01ea173e103e ("xfs: fix u

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

2021-01-27 Thread Christian Brauner
On Tue, Jan 26, 2021 at 07:11:15PM -0800, Darrick J. Wong wrote: > On Wed, Jan 27, 2021 at 11:24:41AM +1100, Stephen Rothwell wrote: > > Hi all, > > > > On Mon, 25 Jan 2021 17:14:14 +1100 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > >

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

2021-01-26 Thread Stephen Rothwell
Hi all, On Mon, 25 Jan 2021 17:14:14 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the pidfd tree got a conflict in: > > fs/xfs/xfs_inode.c > > between commit: > > 01ea173e103e ("xfs: fix up non-directory creation in SGID directories") > > from the xfs tree and commit: >

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

2021-01-26 Thread Darrick J. Wong
On Wed, Jan 27, 2021 at 11:24:41AM +1100, Stephen Rothwell wrote: > Hi all, > > On Mon, 25 Jan 2021 17:14:14 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/xfs/xfs_inode.c > > > > between commit: > > > > 01ea173e103e ("xfs:

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

2021-01-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the pidfd tree got a conflict in: fs/xfs/xfs_inode.c between commit: 01ea173e103e ("xfs: fix up non-directory creation in SGID directories") from the xfs tree and commit: f736d93d76d3 ("xfs: support idmapped mounts") from the pidfd tree. I fixed it