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, 30 Apr 2013 04:02:51 -0400 (EDT) From: David Miller <davem@...emloft.net> To: sfr@...b.auug.org.au Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, ariele@...adcom.com, yuvalmin@...adcom.com, eilong@...adcom.com Subject: Re: linux-next: manual merge of the net-next tree with the net tree From: Stephen Rothwell <sfr@...b.auug.org.au> Date: Fri, 26 Apr 2013 13:24:47 +1000 > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c between commit > ecf01c22be03 ("bnx2x: Prevent NULL pointer dereference in kdump") from > the net tree and commit 5b0752c863d7 ("bnx2x: Fix VF statistics") from > the net-next tree. > > I am not sure about this, but I just used the net tree version but I > assume something more may be needed and can carry the fix as necessary (no > action is required). I've just resolved this when I merged net into net-next. -- 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