Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index f0295c60f5aceb975575903327228776d6b2bb9e..ba07c8c57107a8438d5b3ce1a49761dba7182d25 100644 (file)
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -222,6 +222,9 @@ D-C-O.  Indeed you are encouraged to do so.  Do not forget to
 place an in-body "From: " line at the beginning to properly attribute
 the change to its true author (see (2) above).
 
+Also notice that a real name is used in the Signed-off-by: line. Please
+don't hide your real name.
+
 Some people also put extra tags at the end.
 
 "Acked-by:" says that the patch was reviewed by the person who