From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751313AbdFFBtq (ORCPT ); Mon, 5 Jun 2017 21:49:46 -0400 Received: from ozlabs.org ([103.22.144.67]:47647 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751195AbdFFBtp (ORCPT ); Mon, 5 Jun 2017 21:49:45 -0400 Date: Tue, 6 Jun 2017 11:49:41 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Florian Fainelli , Vivien Didelot Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20170606114941.20a80fb0@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/dsa/dsa2.c between commit: b07ac9894644 ("net: dsa: Fix stale cpu_switch reference after unbind then bind") from the net tree and commits: 8b0d3ea55587 ("net: dsa: store CPU port pointer in the tree") 937c7df85ce7 ("net: dsa: Pass dsa_port reference to ethtool setup/restore") from the net-next tree. I fixed it up (I think (maybe it should be "dst->cpu_dp.ds = NULL"?) - see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/dsa/dsa2.c index 7796580e99ee,cd13bb54a30c..000000000000 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@@ -484,10 -474,8 +474,10 @@@ static void dsa_dst_unapply(struct dsa_ dsa_ds_unapply(dst, ds); } - if (dst->cpu_switch) { - dsa_cpu_port_ethtool_restore(dst->cpu_switch); - dst->cpu_switch = NULL; - if (dst->cpu_dp) ++ if (dst->cpu_dp) { + dsa_cpu_port_ethtool_restore(dst->cpu_dp); ++ dst->cpu_dp = NULL; + } pr_info("DSA: tree %d unapplied\n", dst->tree); dst->applied = false;