summaryrefslogtreecommitdiff
path: root/README.patches
diff options
context:
space:
mode:
Diffstat (limited to 'README.patches')
-rw-r--r--README.patches12
1 files changed, 11 insertions, 1 deletions
diff --git a/README.patches b/README.patches
index 3ee55ff29..b6742b62c 100644
--- a/README.patches
+++ b/README.patches
@@ -1,5 +1,5 @@
Mauro Carvalho Chehab <mchehab at infradead dot org>
- Updated on 2008 February, 14
+ Updated on 2008 June, 29
This file describes the general procedures used by the LinuxTV team (*)
and by the v4l-dvb community.
@@ -356,6 +356,16 @@ m) "Commit earlier and commit often". This is a common used rule at
changeset should ideally address just one issue. So, mixing different
things at the same patch should be avoided.
+n) Sometimes, the maintainer may need to slightly modify patches you receive
+ in order to merge them, because the code is not exactly the same in your
+ tree and the submitters'. In order to save time, it may do the changes and
+ add a line before his SOB, as stated on Documentation/SubmittingPatches,
+ describing what he did to merge it. Something like:
+
+ Signed-off-by: Random J Developer <random@developer.example.org>
+ [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
+ Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
+
5. Knowing about newer patches committed at master hg repository
=============================================================