From: "Mintz, Yuval" <Yuval.Mintz@cavium.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
CC: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "Amrani, Ram" <Ram.Amrani@cavium.com>,
        Doug Ledford <dledford@redhat.com>
Subject: Re: linux-next: manual merge of the net tree with Linus' tree
Thread-Topic: linux-next: manual merge of the net tree with Linus' tree
Thread-Index: AQHSJyj5nVMvfTq6rkazT5Zn097jSKCsh4Ug
Date: Mon, 17 Oct 2016 11:41:49 +0000
Message-ID: <BL2PR07MB2306E247793F8600405A6E238DD00@BL2PR07MB2306.namprd07.prod.outlook.com>
References: <20161016081317.229c5c47@canb.auug.org.au>
In-Reply-To: <20161016081317.229c5c47@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Oct 2016 11:41:49.6190
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 711e4ccf-2e9b-4bcf-a551-4094005b6194
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2206
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id u9HBvW21001916
Content-Length: 1586
Lines: 49

> Today's linux-next merge of the net tree got a conflict in:

> ? drivers/net/ethernet/qlogic/Kconfig

> between commit:

> ? 2e0cbc4dd077 ("qedr: Add RoCE driver framework")

> from Linus' tree and commit:

> ? 0189efb8f4f8 ("qed*: Fix Kconfig dependencies with INFINIBAND_QEDR")

> from the net 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.? 

My bad; I've sent the fix to 'net' and was not aware that the
qedr submission was already accepted in linux-rdma.

> I also added this merge fix patch:

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Sun, 16 Oct 2016 08:09:42 +1100
> Subject: [PATCH] qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move

> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> ?drivers/infiniband/hw/qedr/Kconfig | 1 +
> ?1 file changed, 1 insertion(+)

> diff --git a/drivers/infiniband/hw/qedr/Kconfig b/drivers/infiniband/hw/qedr/Kconfig
> index 7c06d85568d4..6c9f3923e838 100644
> --- a/drivers/infiniband/hw/qedr/Kconfig
> +++ b/drivers/infiniband/hw/qedr/Kconfig
> @@ -2,6 +2,7 @@ config INFINIBAND_QEDR
> ???????? tristate "QLogic RoCE driver"
> ???????? depends on 64BIT && QEDE
> ???????? select QED_LL2
> +?????? select QED_RDMA
> ???????? ---help---
> ?????????? This driver provides low-level InfiniBand over Ethernet
> ?????????? support for QLogic QED host channel adapters (HCAs).
> -- 
> 2.8.1

Looks good; Thanks.