Re: linux-next: duplicate patches in the gfs2 and xfs trees

2018-07-11 Thread Darrick J. Wong
On Thu, Jul 12, 2018 at 07:16:18AM +0200, Andreas Gruenbacher wrote: > Hi Stephen, > > On 12 July 2018 at 06:41, Stephen Rothwell wrote: > > Hi Andreas, > > > > On Thu, 12 Jul 2018 04:30:07 +0200 Andreas Gruenbacher > > wrote: > >> > >> this is what I'm seeing (git log --pretty=oneline --abbrev

Re: linux-next: duplicate patches in the gfs2 and xfs trees

2018-07-11 Thread Andreas Gruenbacher
Hi Stephen, On 12 July 2018 at 06:41, Stephen Rothwell wrote: > Hi Andreas, > > On Thu, 12 Jul 2018 04:30:07 +0200 Andreas Gruenbacher > wrote: >> >> this is what I'm seeing (git log --pretty=oneline --abbrev-commit >> --graph ^origin/master gfs2/for-next): >> >> * f79caf101801 (gfs2/for-next)

Re: linux-next: duplicate patches in the gfs2 and xfs trees

2018-07-11 Thread Stephen Rothwell
Hi Andreas, On Thu, 12 Jul 2018 04:30:07 +0200 Andreas Gruenbacher wrote: > > this is what I'm seeing (git log --pretty=oneline --abbrev-commit > --graph ^origin/master gfs2/for-next): > > * f79caf101801 (gfs2/for-next) gfs2: use iomap_readpage for blocksize > == PAGE_SIZE > * af58827ee500 gfs2

Re: linux-next: duplicate patches in the gfs2 and xfs trees

2018-07-11 Thread Andreas Gruenbacher
Hi, On 12 July 2018 at 03:37, Stephen Rothwell wrote: > Hi all, > > It looks like part of the xfs tree (the iomap-4.19-merge branch) that > was merge into the gfs2 tree has been rebased and the gfs2 tree has not > been updated to cope. The rebase commits are exactly the same patches > (though I

linux-next: duplicate patches in the gfs2 and xfs trees

2018-07-11 Thread Stephen Rothwell
Hi all, It looks like part of the xfs tree (the iomap-4.19-merge branch) that was merge into the gfs2 tree has been rebased and the gfs2 tree has not been updated to cope. The rebase commits are exactly the same patches (though I didn't check to see if any of the commit messages had changed). --