Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1240041

linux-next: manual merge of the net-next tree with the net tree

Show all headers | View raw

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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the net tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-06 02:20 +0200

csiph-web