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, 2 Apr 2013 11:30:38 +0200 From: Samuel Ortiz <sameo@...ux.intel.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, "John W. Linville" <linville@...driver.com> Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree Hi John, Stephen, On Tue, Apr 02, 2013 at 01:00:44PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > drivers/nfc/microread/mei.c between commit 9593b0b1179c ("NFC: microread: > Fix build failure due to a new MEI bus API") from the wireless tree and > commit 63cd353c34a0 ("NFC: microread: Fix MEI build failure") from the > net-next tree. John, sorry for the conflict. I sent a patch to John for wireless-next that will fix it once it ends up in net-next. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- 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