From: David S. Miller Date: Tue, 7 Jan 2014 23:44:35 +0000 (-0500) Subject: Merge branch 'tipc' X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=8752b5caed54baa36c056b5c279ccdcf2805b9f6 Merge branch 'tipc' Jon Maloy says: ==================== tipc: link setup and failover improvements This series consists of four unrelated commits with different purposes. - Commit #1 is purely cosmetic and pedagogic, hopefully making the failover/tunneling logics slightly easier to understand. - Commit #2 fixes a bug that has always been in the code, but was not discovered until very recently. - Commit #3 fixes a non-fatal race issue in the neighbour discovery code. - Commit #4 removes an unnecessary indirection step during link startup. ==================== Signed-off-by: David S. Miller --- 8752b5caed54baa36c056b5c279ccdcf2805b9f6