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

2021-04-20 Thread Darrick J. Wong
On Mon, Apr 19, 2021 at 10:49:48AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the vfs tree got a conflict in: > > fs/xfs/xfs_ioctl.c > > between commit: > > b2197a36c0ef ("xfs: remove XFS_IFEXTENTS") > > from the xfs tree and commit: > > 9fefd5db08ce ("xfs:

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

2021-04-13 Thread Darrick J. Wong
On Mon, Apr 12, 2021 at 12:22:11PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the vfs tree got a conflict in: > > fs/xfs/xfs_ioctl.c > > between commits: > > ceaf603c7024 ("xfs: move the di_projid field to struct xfs_inode") > 031474c28a3a ("xfs: move the di_

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

2018-10-30 Thread Dave Chinner
On Wed, Oct 31, 2018 at 11:52:47AM +1100, Stephen Rothwell wrote: > Hi all, > > [I don't understand why all this new work turned up in the xfs tree > during the merge window ...] > > Today's linux-next merge of the vfs tree got a conflict in: > > fs/read_write.c > > between commits: > > 42

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

2015-04-12 Thread Dave Chinner
On Mon, Apr 13, 2015 at 11:57:37AM +1000, Stephen Rothwell wrote: > Hi Al, > > Today's linux-next merge of the vfs tree got a conflict in > fs/xfs/xfs_iops.c between commit e8e9ad42c1f1 ("xfs: take i_mmap_lock > on extent manipulation operations") from the xfs tree and commit > 5dd3dc06371a ("VFS: