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: Mon, 13 Jan 2014 21:48:41 -0800 (PST) From: David Miller <davem@...emloft.net> To: sfr@...b.auug.org.au Cc: hpa@...or.com, tglx@...utronix.de, mingo@...nel.org, peterz@...radead.org, netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the tip tree with the net-next tree From: Stephen Rothwell <sfr@...b.auug.org.au> Date: Tue, 14 Jan 2014 16:44:20 +1100 > On Mon, 13 Jan 2014 21:19:46 -0800 (PST) David Miller <davem@...emloft.net> wrote: >> >> From: "H. Peter Anvin" <hpa@...or.com> >> Date: Mon, 13 Jan 2014 20:51:43 -0800 >> >> > Is there a sensible way we can fix this in either net-next or tip? >> >> I think if I sort the files in net-next the problem will go away, >> if someone can confirm this I'll do it. > > I have attached 2 patches: one for net-next and one for tip/auto-latest > (but should be applicable in the appropriate topic branch). If both are > applied to their respect trees, then I get no conflict when merging the > two trees. Net patch applied, thanks Stephen. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists