Re: [GIT PULL] percpu changes for 2.6.38

[H. Peter Anvin]

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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/