[lkml]   [2012]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the driver-core tree with the driver-core.current tree
On Fri, Feb 03, 2012 at 02:51:06PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/cpu.c between commit 2885e25c422f ("driver core: cpu: remove
> kernel warning when removing a cpu") from the driver-core.current tree
> and commit fad12ac8c8c2 ("CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86
> parts") from the driver-core tree.
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Thanks for this, I'll fix it up when I merge them back together when
3.3-rc3 comes out.

greg k-h

 \ /
  Last update: 2012-02-03 16:11    [W:0.038 / U:0.124 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site