Re: linux-next: bad merge in the y2038 tree

From: Stephen Rothwell
Date: Thu Dec 06 2018 - 18:07:34 EST


Hi Arnd,

On Thu, 6 Dec 2018 23:09:01 +0100 Arnd Bergmann <arnd@xxxxxxxx> wrote:
>
> On Thu, Dec 6, 2018 at 9:12 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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

Attachment: pgpBmhZpFG8n3.pgp
Description: OpenPGP digital signature