From patchwork Tue Jun 13 01:43:59 2023
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: 13277822
Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net
 [23.128.96.19])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECD0D17C7
	for <netdev@vger.kernel.org>; Tue, 13 Jun 2023 01:44:11 +0000 (UTC)
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
	by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD55E91;
	Mon, 12 Jun 2023 18:44:08 -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 4QgBDL0pVrz4xFc;
	Tue, 13 Jun 2023 11:44:01 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1686620642;
	bh=Vhn9NCKI4b+ZWwXU2mlVYVnz7rRJJ08hkIiKzkVYNNo=;
	h=Date:From:To:Cc:Subject:From;
	b=Gl2PVoSMjROmQV85BXjwHm8FVfTw9DainPcCxPYiy604f5OA0xu+ovoq2fmrPponP
	 uN4+Ru7Q64Mq1e98klr030HcrwHBch4w75LHIcz7mcLrRPylGxccjCvgptG+8cNX6X
	 CS2kESfJEDeCl8NNP+u1qzfDOipm6WTF4gDz/bFK/HlZYyZk6oO42gsgGXd1e1NU0w
	 /X6ZD7PE/GMIdfwXqNjZ0lQIh2wE6SAfNcyW38Eu1ykLxEkoj0HOsYKz86+0xv1YV6
	 1PNiwJxRw2X+zzmJybJ6pXjffzrExxOIwpHEbZQm604GWcKs+f3hSZzIkRrtud5dse
	 s80OG90aEei4w==
Date: Tue, 13 Jun 2023 11:43:59 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, Doug Ledford <dledford@redhat.com>,
 Jason Gunthorpe <jgg@mellanox.com>
Cc: Networking <netdev@vger.kernel.org>, Daniel Jurgens
 <danielj@nvidia.com>, Leon Romanovsky <leon@kernel.org>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Mark Bloch <mbloch@nvidia.com>, Saeed
 Mahameed <saeedm@nvidia.com>
Subject: linux-next: manual merge of the net-next tree with the rdma-fixes
 tree
Message-ID: <20230613114359.59cadc05@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: netdev@vger.kernel.org
List-Id: <netdev.vger.kernel.org>
List-Subscribe: <mailto:netdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:netdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS,
	T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net

Hi all,

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

  include/linux/mlx5/driver.h

between commit:

  617f5db1a626 ("RDMA/mlx5: Fix affinity assignment")

from the rdma-fixes tree and commit:

  dc13180824b7 ("net/mlx5: Enable devlink port for embedded cpu VF vports")

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 include/linux/mlx5/driver.h
index e0156b54d0b3,18a608a1f567..000000000000
--- a/include/linux/mlx5/driver.h