LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] Make Andrew's life easier
@ 2008-03-04 15:02 Matthew Wilcox
0 siblings, 0 replies; only message in thread
From: Matthew Wilcox @ 2008-03-04 15:02 UTC (permalink / raw)
To: Andrew Morton, Linus Torvalds; +Cc: linux-kernel
Andrew recently complained that feature-removal-schedule.txt is always
generating conflicts. The reason is clear; everybody adds to the
bottom of the file. The solution he proposed is to place entries at
random places in the file. However, we can make the tools work for
us here quite simply by adding a separator at the bottom of the file.
Then diff produces a patch which contains no meaningful context and
patch will happily put new entries into the file in a random order.
Unfortunately, git-cherry-pick won't, but I don't think Andrew uses it,
so he'll be happy anyway.
This will fail if people subsequently fail to add a separator at the
bottom of a file. But then those people can be legitimately grumped at.
Signed-off-by: Matthew Wilcox <firstname.lastname@example.org>
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index c1d1fd0..325e5b4 100644
@@ -328,3 +328,6 @@ Why: Not used in-tree. The current out-of-tree users used it to
code / infrastructure should be in the kernel and not in some
Who: Thomas Gleixner <email@example.com>
Intel are signing my paycheques ... these opinions are still mine
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours. We can't possibly take such
a retrograde step."
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-04 15:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-04 15:02 [PATCH] Make Andrew's life easier Matthew Wilcox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).