* linux-next: bad merge in the y2038 tree
@ 2018-12-06 20:11 Stephen Rothwell
2018-12-06 22:09 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2018-12-06 20:11 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: bad merge in the y2038 tree
2018-12-06 20:11 linux-next: bad merge in the y2038 tree Stephen Rothwell
@ 2018-12-06 22:09 ` Arnd Bergmann
2018-12-06 23:07 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2018-12-06 22:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
On Thu, Dec 6, 2018 at 9:12 PM Stephen Rothwell <sfr@canb.auug.org.au> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: bad merge in the y2038 tree
2018-12-06 22:09 ` Arnd Bergmann
@ 2018-12-06 23:07 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2018-12-06 23:07 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
Hi Arnd,
On Thu, 6 Dec 2018 23:09:01 +0100 Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Thu, Dec 6, 2018 at 9:12 PM Stephen Rothwell <sfr@canb.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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-06 23:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-06 20:11 linux-next: bad merge in the y2038 tree Stephen Rothwell
2018-12-06 22:09 ` Arnd Bergmann
2018-12-06 23:07 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).