From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Arnd Bergmann <arnd@arndb.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dmitry Safonov <dima@arista.com>
Subject: Re: linux-next: manual merge of the y2038 tree with the tip tree
Date: Tue, 3 Dec 2019 07:58:12 +0100 [thread overview]
Message-ID: <20191203065812.GB115767@gmail.com> (raw)
In-Reply-To: <20191203140259.33291393@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> This is now a conflict between the tip tree and Linus' tree.
This too should be resolved in my latest update of the -next integration
branch tip:auto-latest.
Thanks,
Ingo
prev parent reply other threads:[~2019-12-03 6:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 2:01 linux-next: manual merge of the y2038 tree with the tip tree Stephen Rothwell
2019-11-27 9:24 ` Arnd Bergmann
2019-12-03 3:02 ` Stephen Rothwell
2019-12-03 6:58 ` Ingo Molnar [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=20191203065812.GB115767@gmail.com \
--to=mingo@kernel.org \
--cc=arnd@arndb.de \
--cc=dima@arista.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.