From: David S. Miller Date: Sat, 23 Aug 2014 18:18:41 +0000 (-0700) Subject: Merge branch 'tipc-next' X-Git-Tag: v4.14-rc1~6661^2~242 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5aa8dbbd5f9ae6ec6f5ab88596a29a5b5d4caf31;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'tipc-next' Jon Maloy says: ==================== tipc: Merge port and socket layer code After the removal of the TIPC native interface, there is no reason to keep a distinction between a "generic" port layer and a "specific" socket layer in the code. Throughout the last months, we have posted several series that aimed at facilitating removal of the port layer, and in particular the port_lock spinlock, which in reality duplicates the role normally kept by lock_sock()/bh_lock_sock(). In this series, we finalize this work, by making a significant number of changes to the link, node, port and socket code, all with the aim of reducing dependencies between the layers. In the final commits, we then remove the port spinlock, port.c and port.h altogether. After this series, we have a socket layer that has only few dependencies to the rest of the stack, so that it should be possible to continue cleanups of its code without significantly affecting other code. ==================== Signed-off-by: David S. Miller --- 5aa8dbbd5f9ae6ec6f5ab88596a29a5b5d4caf31