From: Greg Kroah-Hartman Date: Mon, 8 Oct 2012 15:38:48 +0000 (-0700) Subject: 3.5-stable patches X-Git-Tag: v3.0.46~65 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e915d6ee7dc838e8fd54209b3fa02bfe66408ad1;p=thirdparty%2Fkernel%2Fstable-queue.git 3.5-stable patches added patches: --- diff --git a/queue-3.5/revert-dyndbg-fix-for-soh-in-logging-messages.patch b/queue-3.5/revert-dyndbg-fix-for-soh-in-logging-messages.patch new file mode 100644 index 00000000000..0724ff447c7 --- /dev/null +++ b/queue-3.5/revert-dyndbg-fix-for-soh-in-logging-messages.patch @@ -0,0 +1,36 @@ +From foo@baz Mon Oct 8 08:36:24 PDT 2012 +Date: Mon, 08 Oct 2012 08:36:24 -0700 +To: Greg KH +From: Greg Kroah-Hartman +Subject: Revert dyndbg: fix for SOH in logging messages + +This reverts commit 3d822616ca81881d8c19d0b473e79ba241c700de, which is +ebdc82899ec5ed35af1c79ed6a4eeda69dad9b90 upstream, as it's not needed in +the 3.5.y tree. + +Reported-by: Wouter M. Koolen +Cc: Markus Trippelsdorf +Cc: Jim Cromie +Cc: Linus Torvalds +Cc: Andrew Morton +Cc: Jason Baron +Signed-off-by: Greg Kroah-Hartman + + +--- + drivers/base/core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -1895,8 +1895,8 @@ int __dev_printk(const char *level, cons + "DEVICE=+%s:%s", subsys, dev_name(dev)); + } + skip: +- if (level[2]) +- level_extra = &level[2]; /* skip past KERN_SOH "L" */ ++ if (level[3]) ++ level_extra = &level[3]; /* skip past "" */ + + return printk_emit(0, level[1] - '0', + dictlen ? dict : NULL, dictlen, diff --git a/queue-3.5/series b/queue-3.5/series new file mode 100644 index 00000000000..09c083c7211 --- /dev/null +++ b/queue-3.5/series @@ -0,0 +1 @@ +revert-dyndbg-fix-for-soh-in-logging-messages.patch