Messages in this thread | | | Date | Fri, 30 Aug 2013 15:26:40 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the driver-core tree with the pm tree |
| |
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/base/core.c index ac419a1,c7b0925..0000000 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@@ -1489,21 -1450,18 +1475,6 @@@ int __init devices_init(void return -ENOMEM; } - EXPORT_SYMBOL_GPL(device_for_each_child); - EXPORT_SYMBOL_GPL(device_find_child); - EXPORT_SYMBOL_GPL(device_initialize); - EXPORT_SYMBOL_GPL(device_add); - EXPORT_SYMBOL_GPL(device_register); -static DEFINE_MUTEX(device_hotplug_lock); -- - EXPORT_SYMBOL_GPL(device_del); - EXPORT_SYMBOL_GPL(device_unregister); - EXPORT_SYMBOL_GPL(get_device); - EXPORT_SYMBOL_GPL(put_device); -void lock_device_hotplug(void) -{ - mutex_lock(&device_hotplug_lock); -} -- - EXPORT_SYMBOL_GPL(device_create_file); - EXPORT_SYMBOL_GPL(device_remove_file); -void unlock_device_hotplug(void) -{ - mutex_unlock(&device_hotplug_lock); -} -- static int device_check_offline(struct device *dev, void *not_used) { int ret; [unhandled content-type:application/pgp-signature] | |