[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4D27B0B7.5060102@zytor.com>
Date: Fri, 07 Jan 2011 16:32:55 -0800
From: "H. Peter Anvin" <hpa@...or.com>
To: Tejun Heo <tj@...nel.org>
CC: Linus Torvalds <torvalds@...ux-foundation.org>,
Christoph Lameter <cl@...ux-foundation.org>,
linux-kernel@...r.kernel.org, x86@...nel.org
Subject: Re: [GIT PULL] percpu changes for 2.6.38
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists