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, 7 Apr 2015 09:54:29 -0700 From: Cong Wang <xiyou.wangcong@...il.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: David Miller <davem@...emloft.net>, Linux Kernel Network Developers <netdev@...r.kernel.org>, linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>, "Eric W. Biederman" <ebiederm@...ssion.com> Subject: Re: linux-next: manual merge of the net-next tree with the net tree On Mon, Apr 6, 2015 at 8:21 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > net/core/fib_rules.c between commit 419df12fb5fa ("net: move > fib_rules_unregister() under rtnl lock") from the net tree and commit > efd7ef1c1929 ("net: Kill hold_net release_net") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > Looks correct to me. Thanks! -- 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