| 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, 21 Jul 2009 01:36:38 +0900 From: Paul Mundt <lethal@...ux-sh.org> To: Tim Abbott <tabbott@...lice.com> Cc: Sam Ravnborg <sam@...nborg.org>, linux-kernel@...r.kernel.org, David Howells <dhowells@...hat.com>, Anders Kaseorg <andersk@...lice.com> Subject: Re: [PATCH] Restructure BSS linker script macros. On Mon, Jul 20, 2009 at 12:33:07PM -0400, Tim Abbott wrote: > On Sat, 18 Jul 2009, Sam Ravnborg wrote: > > I do not expect Tejun's work to be included until next merge window. > > Yes, but I expect the "sh" patch presumably to go in at the next merge > window as well. Since in this case the conflict was both patches making > similar changes where Tejun's was more extensive, I figured I might as > well save someone from having to resolve this useless merge conflict > during the next merge window. > Correct, the sh change is queued for the next merge window. For 2.6.31 we are not using the generic macros in the script, so the breakage is immaterial there. There will be a bit of an ordering issue for the merge window with regards to the kbuild fixes, but as long as the revised macros show up at some point then I can merge after that. If kbuild-fixes merges before the merge window then of course the ordering issue goes away. -- 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