From: "H. Peter Anvin" <hpa@zytor.com>
To: Tejun Heo <tj@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Christoph Lameter <cl@linux-foundation.org>,
linux-kernel@vger.kernel.org, x86@kernel.org
Subject: Re: [GIT PULL] percpu changes for 2.6.38
Date: Fri, 07 Jan 2011 16:32:55 -0800 [thread overview]
Message-ID: <4D27B0B7.5060102@zytor.com> (raw)
In-Reply-To: <20110107221448.GA9884@mtj.dyndns.org>
On 01/07/2011 02:14 PM, Tejun Heo wrote:
> Pulling this branch into the current master (01539ba2) causes three
> conflicts under arch/x86. This is because merging percpu into x86
> seemed to make the dependency a bit too hairy causing changes applying
> this_cpu_*() ops to arch/x86 code conflict with other x86 changes.
For the record, this flow was ACKed by myself and Ingo.
-hpa
prev parent reply other threads:[~2011-01-08 0:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-07 22:14 [GIT PULL] percpu changes for 2.6.38 Tejun Heo
2011-01-08 0:32 ` H. Peter Anvin [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=4D27B0B7.5060102@zytor.com \
--to=hpa@zytor.com \
--cc=cl@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@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 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.