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: Sun, 22 Nov 2009 17:19:32 -0800 (PST) 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, eric.dumazet@...il.com Subject: Re: linux-next: manual merge of the net tree with the net-current tree From: Stephen Rothwell <sfr@...b.auug.org.au> Date: Mon, 23 Nov 2009 12:00:52 +1100 > Today's linux-next merge of the net tree got a conflict in > drivers/ieee802154/fakehard.c between commit > 56cf54831fd1be105e89a9df899e3b22442da180 ("ieee802154: dont leak skbs in > ieee802154_fake_xmit()") from the net-current tree and commit > 8964be4a9a5ca8cab1219bb046db2f6d1936227c ("net: rename skb->iif to > skb->skb_iif") from the net tree. > > The former removed the code modified by the latter, so I used the former. Hmmm... I specifically remember taking core of this conflict when I merged net-next-2.6 into net-2.6 yesterday or the day before. -- 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