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

From: Arnd Bergmann
Date: Thu Dec 06 2018 - 17:09:23 EST


On Thu, Dec 6, 2018 at 9:12 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi Arnd,
>
> 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.

Sorry about that.

Arnd