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

[Greg KH]

On Fri, Jun 07, 2013 at 02:49:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/memory.c between commit 4960e05e2260 ("Driver core:
> Introduce offline/online callbacks for memory blocks") from the pm tree
> and commit 96b2c0fc8e74 ("drivers/base: Use attribute groups to create
> sysfs memory files") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h
--
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/