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: Fri, 21 Sep 2012 14:58:48 -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, bjorn@...k.no 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, 21 Sep 2012 11:30:09 +1000 > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/usb/qmi_wwan.c between commit 9db273f45686 ("net: > qmi_wwan: adding Huawei E367, ZTE MF683 and Pantech P4200") from the > net tree and commit bd877e489126 ("net: qmi_wwan: use a single bind > function for all device types") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks Stephen, this should be resolved over the weekend as I plan to do a merge during this time. -- 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