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, 29 Nov 2009 17:12:02 -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, bruce.w.allan@...el.com, jeffrey.t.kirsher@...el.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: Tue, 24 Nov 2009 14:11:31 +1100 > Hi all, > > Today's linux-next merge of the net tree got a conflict in > drivers/net/e1000e/phy.c between commit > 189983d469c6d98e64ddfb9f9ce76725cb082ee5 ("e1000e: remove unnecessary > 82577 workaround causing link issues") from the net-current tree and > commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops > function pointers") from the net tree. > > I fixed it up (see below) and can carry the fix for a while. This conflict also got dealt with last night when I pulled net-2.6 into net-next-2.6 -- 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