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
| ||
|
Date: Tue, 08 Apr 2014 10:06:09 +0200 From: Michal Marek <mmarek@...e.cz> To: Stephen Rothwell <sfr@...b.auug.org.au> CC: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: strange state of the kbuild tree On 2014-04-07 23:47, Stephen Rothwell wrote: > Hi Michal, > > I noticed that you have two copies of two commits in your tree ("Kbuild, > lto: Set TMPDIR for LTO v4" and "Kbuild, lto: Add Link Time Optimization > support v3"). I understan why you recommitted them (to add your > Signed-off-by), but to leave the unsigned commits in there sort of > defeats the purpose. This is probably a case where you should have > removed the original merge (or just these two commits) and then merged > the new version. Sorry about that. > I am not sure what you intend to send to Linus, but this whole tree (in > one piece) should not be it. From the state of the tree, it looks like > you send your separate topic branches (or a new merge of them) which > should be ok, but please after doing that, clean up your for-next branch > (it current has merge commits dating back to May, 2103 in it). Right, I send the individual topic branches to Linus. Will it be OK if I reset the for-next branch to v3.15-rc1 after this merge window? Thanks, Michal -- 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