From: Ingo Molnar <mingo@kernel.org>
To: Andy Lutomirski <luto@amacapital.net>
Cc: Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>, Tony Luck <tony.luck@intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree
Date: Wed, 21 Jan 2015 06:34:10 +0100 [thread overview]
Message-ID: <20150121053410.GA15291@gmail.com> (raw)
In-Reply-To: <CALCETrW05f9nty5Sk8XA2DTsocqqOxp62aT9QXwta74Km+ZOng@mail.gmail.com>
* Andy Lutomirski <luto@amacapital.net> wrote:
> Hi Ingo and Thomas-
>
> There's a trivial conflict in the pull request I sent last week.
This is your x86 entry code rework pull request, right? The -tip
tree now has the RCU commit it depends on, so could you please
rebase it on top of tip:core/rcu so I can pull it? I'll resolve
any remaining conflicts with the rest of -tip.
Thanks,
Ingo
next prev parent reply other threads:[~2015-01-21 5:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-19 6:08 linux-next: manual merge of the luto-misc tree with the tip tree Stephen Rothwell
2015-01-19 9:35 ` Borislav Petkov
2015-01-21 0:28 ` Fwd: " Andy Lutomirski
2015-01-21 5:34 ` Ingo Molnar [this message]
2015-01-21 5:48 ` Andy Lutomirski
2015-01-21 5:55 ` Andy Lutomirski
2015-01-21 5:55 ` Ingo Molnar
2015-01-21 6:01 ` Andy Lutomirski
2015-01-21 6:16 ` Ingo Molnar
2015-01-27 23:54 ` Andy Lutomirski
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=20150121053410.GA15291@gmail.com \
--to=mingo@kernel.org \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
/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 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).