The patch titled
Subject: lib-documentation-synchronize-%p-formatting-documentation-fix
has been removed from the -mm tree. Its filename was
lib-documentation-synchronize-%p-formatting-documentation-fix.patch
This patch was dropped because it was folded into lib-documentation-synchronize-%p-formatting-documentation.patch
------------------------------------------------------
From: Martin Kletzander <mkletzan@xxxxxxxxxx>
Subject: lib-documentation-synchronize-%p-formatting-documentation-fix
Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/printk-formats.txt | 6 ++++--
lib/vsprintf.c | 13 ++++++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
diff -puN Documentation/printk-formats.txt~lib-documentation-synchronize-%p-formatting-documentation-fix Documentation/printk-formats.txt
--- a/Documentation/printk-formats.txt~lib-documentation-synchronize-%p-formatting-documentation-fix
+++ a/Documentation/printk-formats.txt
@@ -307,9 +307,11 @@ Command from struct task_struct
Ignored argument:
- %pn
+ %n %n
- The argument passed will be ignored.
+ The argument passed will be ignored. In other words, literal "%n" will
+ be in the output and the argument will be considered for next format
+ specifier.
Thank you for your cooperation and attention.
diff -puN lib/vsprintf.c~lib-documentation-synchronize-%p-formatting-documentation-fix lib/vsprintf.c
--- a/lib/vsprintf.c~lib-documentation-synchronize-%p-formatting-documentation-fix
+++ a/lib/vsprintf.c
@@ -1450,7 +1450,7 @@ int kptr_restrict __read_mostly;
* - 'Cr' For a clock, it prints the current rate of the clock
* - 'n' For ignored argument
*
- * ** Please update Documentation/printk-formats.txt when making changes **
+ * ** Please update also Documentation/printk-formats.txt when making changes **
*
* Note: The difference between 'S' and 'F' is that on ia64 and ppc64
* function pointers are really function descriptors, which contain a
@@ -1814,11 +1814,14 @@ qualifier:
* @fmt: The format string to use
* @args: Arguments for the format string
*
- * This function follows C99 vsnprintf, but has some extensions. See
- * pointer() or Documentation/printk-formats.txt for all format
- * specifiers.
+ * This function follows C99 vsnprintf, but has some extensions:
+ * %n is ignored
+ * %p* is handled by pointer()
*
- * ** Please update the documentation when making changes **
+ * See pointer() or Documentation/printk-formats.txt for more
+ * extensive description.
+ *
+ * ** Please update the documentation on both places when making changes **
*
* The return value is the number of characters which would
* be generated for the given input, excluding the trailing
_
Patches currently in -mm which might be from mkletzan@xxxxxxxxxx are
lib-documentation-synchronize-%p-formatting-documentation.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
