From: Alex Shi <alex.shi@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tejun Heo <tj@kernel.org>, Rusty Russell <rusty@rustcorp.com.au>,
Christoph Lameter <cl@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Suresh Siddha <suresh.b.siddha@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the percpu tree with the tip tree
Date: Wed, 16 May 2012 21:40:02 +0800 [thread overview]
Message-ID: <4FB3AE32.8060006@intel.com> (raw)
In-Reply-To: <20120516173616.ed5b60cf4b16e34a57206559@canb.auug.org.au>
On 05/16/2012 03:36 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the percpu tree got a conflict in
> arch/x86/mm/tlb.c between commit a6fca40f1d7f ("x86, tlb: Switch cr3 in
> leave_mm() only when needed") from the tip tree and commit c6ae41e7d469
> ("x86: replace percpu_xxx funcs with this_cpu_xxx") from the percpu tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks a lot!
My auto-scripts just watching upstream kernel, so missing this...
but happy to know the pain of code clean up is closing soon. ;)
next prev parent reply other threads:[~2012-05-16 13:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 7:36 linux-next: manual merge of the percpu tree with the tip tree Stephen Rothwell
2012-05-16 13:40 ` Alex Shi [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-10-09 4:50 Stephen Rothwell
2014-10-09 13:13 ` Frederic Weisbecker
2014-10-09 13:15 ` Tejun Heo
2014-10-09 13:18 ` Frederic Weisbecker
2011-04-20 3:50 Stephen Rothwell
2011-02-11 3:58 Stephen Rothwell
2011-02-11 9:52 ` Tejun Heo
2011-01-05 2:54 Stephen Rothwell
2010-12-31 2:55 Stephen Rothwell
2010-12-31 11:17 ` Tejun Heo
2010-12-31 2:55 Stephen Rothwell
2010-12-10 2:32 Stephen Rothwell
2010-02-03 5:38 Stephen Rothwell
2010-02-03 22:26 ` Frederic Weisbecker
2009-12-14 4:30 Stephen Rothwell
2009-11-11 7:59 Stephen Rothwell
2009-09-03 9:11 Stephen Rothwell
2009-07-06 5:06 Stephen Rothwell
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=4FB3AE32.8060006@intel.com \
--to=alex.shi@intel.com \
--cc=cl@linux-foundation.org \
--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=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
--cc=suresh.b.siddha@intel.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
/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).