From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: bad merge in the y2038 tree
Date: Fri, 7 Dec 2018 10:07:29 +1100 [thread overview]
Message-ID: <20181207100729.0ed0fc7a@canb.auug.org.au> (raw)
In-Reply-To: <CAK8P3a1U9y7rHq9GUd-BrY4=aLLyBYZLm8X0JcKU6j2_sYCCmQ@mail.gmail.com>
[-- 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 --]
prev parent reply other threads:[~2018-12-06 23:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181207100729.0ed0fc7a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox