linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell
Date: Mon Jun 02 2014 - 22:28:45 EST
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
include/net/inetpeer.h between commit 39c36094d78c ("net: fix
inet_getid() and ipv6_select_ident() bugs") from the tree and commit
73f156a6e8c1 ("inetpeer: get rid of ip_id_count") from the net-next
tree.
I fixed it up (the latter removed the code that the former updated, so
I did that) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: PGP signature