From patchwork Mon Nov 30 02:02:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11939497 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FDCCC64E7B for ; Mon, 30 Nov 2020 02:03:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AFDBC20771 for ; Mon, 30 Nov 2020 02:03:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Y4ln3O0p" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727715AbgK3CDI (ORCPT ); Sun, 29 Nov 2020 21:03:08 -0500 Received: from ozlabs.org ([203.11.71.1]:59621 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726304AbgK3CDH (ORCPT ); Sun, 29 Nov 2020 21:03:07 -0500 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 4CkpQT3mkXz9sVD; Mon, 30 Nov 2020 13:02:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1606701745; bh=2VqswGgISJ85b78+3RIRPfPLRDwCtT1hBsQh9lU4WMg=; h=Date:From:To:Cc:Subject:From; b=Y4ln3O0pTFu4JUKztf2AiKENqu09E8uJVffywreLp0UHRznOG69ub065XBgTVsIGM 8sF/Jpq/0NOF+JaxGVOtIN/F70amCfB3IqCswFskM4h9Kfm+oPf386Zvi24ycyEe95 +El8IbmT47yixafklKHQvafM5jiSvKvBqSgk1n5VYF1hPFSi0dXXkvF+SgZ5Ffx8mU b2TfH6bm0HzcTebslSZEmphS4UGsgxcDv8DhShw8lUGpAcGDiKYt/kwefJZlBH5F1P kaojLYjN3LgGGXENB6qUAkd0mny7iDQHzBJw9hL2Jnwyws8sTFyTBQKhw+o+ecuqiP NXrSDB7KleFtQ== Date: Mon, 30 Nov 2020 13:02:23 +1100 From: Stephen Rothwell To: David Miller , Networking , Jakub Kicinski Cc: Dany Madden , Lijun Pan , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Falcon Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20201130130223.7788ec13@canb.auug.org.au> MIME-Version: 1.0 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/ethernet/ibm/ibmvnic.c between commit: 9281cf2d5840 ("ibmvnic: avoid memset null scrq msgs") from the net tree and commit: f019fb6392e5 ("ibmvnic: Introduce indirect subordinate Command Response Queue buffer") from the net-next tree. I fixed it up (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/ethernet/ibm/ibmvnic.c index bca1becd33f0,cdd1ff9aa9c4..000000000000 --- a/drivers/net/ethernet/ibm/ibmvnic.c