From patchwork Fri May 8 03:18:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1285745 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=A2vwtIRt; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49JFsv0cRsz9sRY for ; Fri, 8 May 2020 13:18:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727067AbgEHDS5 (ORCPT ); Thu, 7 May 2020 23:18:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726542AbgEHDS4 (ORCPT ); Thu, 7 May 2020 23:18:56 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78EACC05BD43; Thu, 7 May 2020 20:18:56 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49JFsn3wgHz9sRf; Fri, 8 May 2020 13:18:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1588907934; bh=B4uY3Ex4bWgXSuVrB2Et/OmOJWIppEgzW97Ll3wlefI=; h=Date:From:To:Cc:Subject:From; b=A2vwtIRtSVg424z6C+2p//DAZ1FfgTNGTd7Ht/TnyTrxFRbiED6Sjqy3UGKXisBKB 7aXVz4UeXGXWR0yqAuLYIdVDEoTqLa4JblvWnpibfa8pHN4lUkg6OOiPqd6aPp9Nti 84khbuLjIfqBEMvYHMgW/IahPT54oQYTpQZFR7+g/bKNDyvrY6jpf04DbeAGpWx2mS S0dkHilRC3tdSdIP4/9zNTb0IZjkEeoMj7EgHATjYg14SRtZHvVg+k7YGmqaP+NKIC B0KxSUi0WZQBYn6RP3ALsu9zb28l8Z1c7O6c81lgz3PT1pTDkcgByE74OBKdb1SrJ3 yos+AtoGdhDRw== Date: Fri, 8 May 2020 13:18:51 +1000 From: Stephen Rothwell To: David Miller , Networking , Doug Ledford , Jason Gunthorpe , Leon Romanovsky , Eric Dumazet Cc: Linux Next Mailing List , Linux Kernel Mailing List , Maor Gottlieb , Saeed Mahameed Subject: linux-next: manual merge of the net-next tree with the rdma tree Message-ID: <20200508131851.5818d84d@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/bonding/bond_main.c between commits: ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves") c071d91d2a89 ("bonding: Add helper function to get the xmit slave based on hash") 29d5bbccb3a1 ("bonding: Add helper function to get the xmit slave in rr mode") from the rdma and mlx5-next trees and commit: ae46f184bc1f ("bonding: propagate transmit status") from the net-next tree. I fixed it up (I think - 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. diff --cc drivers/net/bonding/bond_main.c index 39b1ad7edbb4,4f9e7c421f57..000000000000 --- a/drivers/net/bonding/bond_main.c