linux-next: manual merge of the driver-core tree with the powerpc tree

Greg KH greg at
Thu Jan 5 10:08:09 EST 2012

On Wed, Dec 28, 2011 at 04:51:02PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/powerpc/kernel/sysfs.c between commit 595fe91447b0 ("powerpc: Export
> PIR data through sysfs") from the powerpc tree and commits 8a25a2fd126c
> ("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular
> subsystem") and 707827f3387d ("powerpc/cpuidle: cpuidle driver for
> pSeries") from the driver-core tree.
> I fixed it up (see below) and can carry the fix as necessary.

Looks good, thanks.

greg k-h

More information about the Linuxppc-dev mailing list