| 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: <20120804081907.GK23464@ZenIV.linux.org.uk> Date: Sat, 4 Aug 2012 09:19:07 +0100 From: Al Viro <viro@...IV.linux.org.uk> To: Dongsheng Song <dongsheng.song@...il.com> Cc: Linus Torvalds <torvalds@...ux-foundation.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Artem Bityutskiy <dedekind1@...il.com> Subject: Re: Linux 3.6-rc1 On Sat, Aug 04, 2012 at 03:51:01PM +0800, Dongsheng Song wrote: > On Sat, Aug 4, 2012 at 2:19 PM, Al Viro <viro@...iv.linux.org.uk> wrote: > > > > Documentation/sysctl/vm.txt.rej | 21 +++++++++++++ > > vm.txt.rej ??? Grrr... git add Documentation/sysctl/ during conflict-resolving in git am, having forgotten that this turd wasn't removed in process, then a bit of blindness when generating and pasting the diffstat ;-/ Thanks for spotting. I've put the branch sans that idiocy in the same tree; for-linus-2 (basically, branched off at the commit introducing that, then git rm Documentation/sysctl/*.rej to get rid of that sucker, git commit --amend, git cherry-pick <branchpoint>..for-linus) Same shortlog, same diffstat sans that idiocy... Alternatively, it could be fixed up upon merge, if Linus is really dead set against any rebases (same git rm/git commit --amend right after git merge or git pull, whatever Linus uses). Sorry about that ;-/ -- 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