Merge branch 'linus' into sched/urgent

Conflicts:
	kernel/sched_idletask.c

Merge reason: resolve the conflicts, pick up latest changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/md/dm-uevent.c b/drivers/md/dm-uevent.c
index 6f65883aef12..c7c555a8c7b2 100644
--- a/drivers/md/dm-uevent.c
+++ b/drivers/md/dm-uevent.c
@@ -139,14 +139,13 @@ void dm_send_uevents(struct list_head *events, struct kobject *kobj)
                 list_del_init(&event->elist);
 
                 /*
-                 * Need to call dm_copy_name_and_uuid from here for now.
-                 * Context of previous var adds and locking used for
-                 * hash_cell not compatable.
+                 * When a device is being removed this copy fails and we
+                 * discard these unsent events.
                  */
                 if (dm_copy_name_and_uuid(event->md, event->name,
                                           event->uuid)) {
-                        DMERR("%s: dm_copy_name_and_uuid() failed",
-                              __func__);
+                        DMINFO("%s: skipping sending uevent for lost device",
+                               __func__);
                         goto uevent_free;
                 }