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
| ||
|
Message-ID: <20151006111148.27b5225a@canb.auug.org.au> Date: Tue, 6 Oct 2015 11:11:48 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: David Miller <davem@...emloft.net>, <netdev@...r.kernel.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, "David B. Robins" <linux@...idrobins.net>, Dean Jenkins <Dean_Jenkins@...tor.com> Subject: linux-next: manual merge of the net-next tree with the net tree Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/usb/asix_common.c between commit: f6194bcf03e4 ("net: usb: asix: Fix crash on skb alloc failure") from the net tree and commit: 6a570814cd43 ("asix: Continue processing URB if no RX netdev buffer") (among others) from the net-next tree. I fixed it up (I dropped the net tree fixup (assuming that it was fixed in some other manner in the net-next tree)) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@...b.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists