Messages in this thread | | | Date | Tue, 3 Jun 2014 12:28:29 +1000 | From | Stephen Rothwell <> | 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 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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |