linux-kernel - Re: linux-next: manual merge of the xfs tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20180605112531.23b392f3@canb.auug.org.au>
Date:   Tue, 5 Jun 2018 11:25:31 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Dave Chinner <david@...morbit.com>
Cc:     "Darrick J. Wong" <darrick.wong@...cle.com>,
        linux-xfs@...r.kernel.org,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Andreas Gruenbacher <agruenba@...hat.com>,
        Bob Peterson <rpeterso@...hat.com>,
        Christoph Hellwig <hch@....de>,
        Linus <torvalds@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the xfs tree with Linus' tree

Hi Dave,

On Tue, 5 Jun 2018 10:59:04 +1000 Dave Chinner <david@...morbit.com> wrote:
>
> On Tue, Jun 05, 2018 at 10:34:03AM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the xfs tree got a conflict in:
> > 
> >   fs/gfs2/bmap.c
> > 
> > between commit:
> > 
> >   628e366df11c ("gfs2: Iomap cleanups and improvements")
> > 
> > from Linus' tree and commit:
> > 
> >   7ee66c03e40a ("iomap: move IOMAP_F_BOUNDARY to gfs2")
> > 
> > from the xfs tree.
> 
> We should have seen this before the gfs2 tree was merged into Linus'
> tree. Does that mean the gfs2 tree is not being pulled into the
> linux-next tree?

It is pulled in, but the above gfs2 commit was only committed to the
linux-next included branch overnight and then Linus was asked to pull
it before I got a chance to build today's linux-next.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped