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 s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
