linux-kernel - Re: linux-next: manual merge of the y2038 tree with the xfs 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: <20191203132300.3186125c@canb.auug.org.au>
Date:   Tue, 3 Dec 2019 13:23:00 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Darrick J. Wong" <darrick.wong@...cle.com>
Cc:     David Chinner <david@...morbit.com>, linux-xfs@...r.kernel.org,
        Arnd Bergmann <arnd@...db.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Christoph Hellwig <hch@....de>,
        Al Viro <viro@...iv.linux.org.uk>,
        Linus <torvalds@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the y2038 tree with the xfs tree

Hi Darrick,

On Mon, 2 Dec 2019 16:22:58 -0800 "Darrick J. Wong" <darrick.wong@...cle.com> wrote:
>
> On Tue, Dec 03, 2019 at 11:00:39AM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > This conflict is now between the xfs tree and Linus' tree (and the
> > merge fix up patch below needs applying to that merge.  
> 
> There shouldn't be a conflict any more, since Linus just pulled the xfs
> tree into master and resolved the conflict in the merge commit.
> (Right?  Or am I missing something here post-turkeyweekend? 8))

Yeah, it should all be gone in tomorrow's linux-next.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped