linux-kernel - Re: linux-next: bad merge in the y2038 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: <20181207100729.0ed0fc7a@canb.auug.org.au>
Date:   Fri, 7 Dec 2018 10:07:29 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Arnd Bergmann <arnd@...db.de>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: bad merge in the y2038 tree

Hi Arnd,

On Thu, 6 Dec 2018 23:09:01 +0100 Arnd Bergmann <arnd@...db.de> wrote:
>
> On Thu, Dec 6, 2018 at 9:12 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > The y2038 tree contains a merge of next-20181206.  I cannot use a tree
> > that includes a version of linux-next.  I assume that this was just a
> > test merge, so please remove it.  
> 
> Fixed now, I had pushed the wrong branch after I had done the test build to
> make sure that it wouldn't conflict with anything in yesterday's linux-next.

I figured something like that.  Thanks.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped