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 <sfr@canb.auug.org.au>
X-Patchwork-Id: 1407954
Return-Path: <netdev-owner@vger.kernel.org>
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=<UNKNOWN>)
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=Y4ln3O0p;
	dkim-atps=neutral
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by ozlabs.org (Postfix) with ESMTP id 4CkpS24cqFz9sVV
	for <patchwork-incoming-netdev@ozlabs.org>;
 Mon, 30 Nov 2020 13:03:46 +1100 (AEDT)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727715AbgK3CDI (ORCPT
        <rfc822;patchwork-incoming-netdev@ozlabs.org>);
        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 <rfc822;netdev@vger.kernel.org>);
        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 <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Jakub Kicinski <kuba@kernel.org>
Cc: Dany Madden <drt@linux.ibm.com>, Lijun Pan <ljp@linux.ibm.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Thomas Falcon <tlfalcon@linux.ibm.com>
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: <netdev.vger.kernel.org>
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