| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20080304150213.GI24386@parisc-linux.org> Date: Tue, 4 Mar 2008 08:02:13 -0700 From: Matthew Wilcox <matthew@....cx> To: Andrew Morton <akpm@...l.org>, Linus Torvalds <torvalds@...l.org> Cc: linux-kernel@...r.kernel.org Subject: [PATCH] Make Andrew's life easier 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 <willy@...ux.intel.com> diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index c1d1fd0..325e5b4 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -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 out-of-tree driver. Who: Thomas Gleixner <tglx@...utronix.de> + +--------------------------- + -- 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." -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists