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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/ipv4/inet_connection_sock.c

between commit:

  2306c704ce28 ("inet: fix race in reqsk_queue_unlink()")

from the net tree and commit:

  079096f103fa ("tcp/dccp: install syn_recv requests into ehash table")

from the net-next tree.

I fixed it up (the latter rewrote the function, so I dropped the net
tree fix) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/