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

2018-12-06 Thread Stephen Rothwell
Hi Arnd, On Thu, 6 Dec 2018 23:09:01 +0100 Arnd Bergmann wrote: > > On Thu, Dec 6, 2018 at 9:12 PM Stephen Rothwell 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 p

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

2018-12-06 Thread Arnd Bergmann
On Thu, Dec 6, 2018 at 9:12 PM Stephen Rothwell 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

linux-next: bad merge in the y2038 tree

2018-12-06 Thread Stephen Rothwell
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. -- Cheers, Stephen Rothwell pgpQwGyf6VlXY.pgp Description: OpenPGP digital signature