Merge branch 'linus' into timers/urgent

Merge in Linus's branch which already has timers/core merged.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/list_debug.c b/lib/list_debug.c
index 23a5e031cd8b..c24c2f7e296f 100644
--- a/lib/list_debug.c
+++ b/lib/list_debug.c
@@ -87,12 +87,10 @@ void __list_add_rcu(struct list_head *new,
                     struct list_head *prev, struct list_head *next)
 {
         WARN(next->prev != prev,
-                "list_add_rcu corruption. next->prev should be "
-                "prev (%p), but was %p. (next=%p).\n",
+                "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
                 prev, next->prev, next);
         WARN(prev->next != next,
-                "list_add_rcu corruption. prev->next should be "
-                "next (%p), but was %p. (prev=%p).\n",
+                "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
                 next, prev->next, prev);
         new->next = next;
         new->prev = prev;