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

[Greg KH]

On Fri, Aug 30, 2013 at 03:26:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/core.c between commit 5e33bc4165f3 ("driver core / ACPI:
> Avoid device hot remove locking issues") from the  tree and commit
> 86df26870569 ("drivers:base:core: Moved sym export macros to respective
> functions") from the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Merge looks great, 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/