tree b8210cd9a14a3fc205ca254d33de80bf185f2a0c
parent 4a93f5095a628d812b0b30c16d7bacea1efd783c
parent 5c311421a28051036a114aec972d36c72114ed4c
author David S. Miller <davem@davemloft.net> 1394654034 -0400
committer David S. Miller <davem@davemloft.net> 1394654034 -0400

Merge branch 'tipc'

Jon Maloy says:

====================
tipc: simplifications in socket and port layer

After the removal of the tipc native API the relation between
tipc_port and its API types is strictly one-to-one, i.e, the latter
can now only be a socket API. This change opens up for
simplifications both in the code, data and locking structure.

We start with this series, where we ensure that port and socket
structures are co-allocated. Note that the first commit in the
series is unrelated to the above.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>