Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts

Conflicts:
	arch/x86/kernel/head64.c
	arch/x86/mm/mmap.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 3 deletions

diff --git a/net/tipc/node.c b/net/tipc/node.c
index aeef8011ac7d..9b4dcb6a16b5 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -1455,10 +1455,8 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb,
         /* Initiate synch mode if applicable */
         if ((usr == TUNNEL_PROTOCOL) && (mtyp == SYNCH_MSG) && (oseqno == 1)) {
                 syncpt = iseqno + exp_pkts - 1;
-                if (!tipc_link_is_up(l)) {
-                        tipc_link_fsm_evt(l, LINK_ESTABLISH_EVT);
+                if (!tipc_link_is_up(l))
                         __tipc_node_link_up(n, bearer_id, xmitq);
-                }
                 if (n->state == SELF_UP_PEER_UP) {
                         n->sync_point = syncpt;
                         tipc_link_fsm_evt(l, LINK_SYNCH_BEGIN_EVT);