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:03:20 -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, ajit.khaparde@...lex.com, vasundhara.volam@...lex.com, sathya.perla@...lex.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:27:01 +1000 > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/emulex/benet/be.h between commit bc0c3405abbb > ("be2net: fix a Tx stall bug caused by a specific ipv6 packet") from the > net tree and commit 0ad3157e813a ("be2net: Avoid flashing BE3 UFI on > BE3-R chip") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). I fixed it up identically when I merged net into net-next, thanks! -- 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