| Message ID | 20231003103712.5703b5e0@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id
in14csp1753727vqb;
Mon, 2 Oct 2023 16:37:25 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IGXqWSFbdJTGolVNc70TwI+a43BdFGGLSL4AquMT323+1jGeidGsnLHoD7xQeZuhCCEk+eS
X-Received: by 2002:a25:ce4c:0:b0:d90:be3c:47da with SMTP id
x73-20020a25ce4c000000b00d90be3c47damr4950291ybe.38.1696289845522;
Mon, 02 Oct 2023 16:37:25 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1696289845; cv=none;
d=google.com; s=arc-20160816;
b=p9C52T2WGoohSgtson3vmqvzv0NG28Z5f4RJusVAtTlFX1c+I08V6ebXTjkF0dg6bM
cbZS6A4agOfAMSu1niDWP+n6ZP+y1qYIZO2uXF2e/WAJaNt+oN9YPdr3bXcxCLsICNBg
wndMx14yZ1CH2VUEiWWPtkoghoBImiNLSy59Y7qXpeqUBgHGl+0aiNIAxtMkGBZ4/UPf
azYTHqwYCawnSbDdd2ypyVn43L8zSb2q7iT9LghcDws1f4YV96lFNuPVxlg6pmvh+hmA
IlpKvaDvqUDXfHWR00opv4TYRovnlyYK0VFg6aUCGWnsCKN4VqvpkSc/WW356btnLrZv
7OOQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=ZrA7I8jcs22PJNQSuzapXP+rXCoCoW1xUIsZd4l4XmI=;
fh=hmsM+DXeMBPnj/erpFUVWQIggLU9eBxRbZbgsdQ2oug=;
b=A6vXvBBA5NWw0xr1T1ZOBRDSGowEQo3esvUoeMCzMkXoIYeTJ2b4IbH0bjRjdJa2GD
tTflLZG8yNggOFidYNGAlF3bDUvJtxQ/ovjR+rJtUzSoTVznXQBiG4713Cuykk15yhjR
zwrO6NB4NwcZ7c9d78Z8N6EYwHZ28j0HD9plapqRy3ENUVRTHOMdtCWfhuovkOZR+wz1
KCK+q58MAO7iTfneVEo74aWiYfar4LED5dfBwZ9LZ0HFNEhvXVTdfWC/MdtlH/mg1UW2
PwczmZqbQOdXWkcoMEEg+N0e3YFJp64+75iDQQxlaTIC4DkK335rn8/eaSgJmRbDlgpY
X8gg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=k92f4Dqs;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.34 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from howler.vger.email (howler.vger.email. [23.128.96.34])
by mx.google.com with ESMTPS id
l191-20020a6391c8000000b00585adc52bd5si41686pge.730.2023.10.02.16.37.25
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 02 Oct 2023 16:37:25 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=k92f4Dqs;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.34 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by howler.vger.email (Postfix) with ESMTP id CC4EA823CC67;
Mon, 2 Oct 2023 16:37:24 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S237155AbjJBXhV (ORCPT <rfc822;pusanteemu@gmail.com> + 18 others);
Mon, 2 Oct 2023 19:37:21 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58274 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229672AbjJBXhU (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 2 Oct 2023 19:37:20 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31038B4;
Mon, 2 Oct 2023 16:37:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1696289835;
bh=ZrA7I8jcs22PJNQSuzapXP+rXCoCoW1xUIsZd4l4XmI=;
h=Date:From:To:Cc:Subject:From;
b=k92f4Dqs4P6Fo0AbW2VHBQvxnhkpYXvz7zOAFtoODQCCTP6LUHnuazXhj8cnvPAsy
akvXM0B1kWYOgkWezC388pOEl8JpC+0OsIAvXOyTNDUBkQc2CJnEMOB+Wr7aLug6Sz
HptI2OTA8Z7XT8lfcDaPcVcJ8wxmFkHwdZ4ekVjhwZlc+rn2Eu/wtJ3qB0qw+Q34Tw
RzgxjoRWSpjarQf4B3Mbe5XVEbemrQaL7WVGsFVYVWTVOEGH1uVdISfm1+CbFjuyAK
oW8hPmssxpXbU1ijpk/JCiAoURdMiBy2tK/p0jPAtnKAmz7XxemgxB8FtAVZbE19kg
2f4cKzQGpjx6g==
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 (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rzy6L1G3Lz4xNg;
Tue, 3 Oct 2023 10:37:14 +1100 (AEDT)
Date: Tue, 3 Oct 2023 10:37:12 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Leon Romanovsky <leon@kernel.org>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>, Jiri Pirko <jiri@nvidia.com>,
Jiri Pirko <jiri@resnulli.us>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Patrisious Haddad <phaddad@nvidia.com>
Subject: linux-next: manual merge of the mlx5-next tree with the net-next
tree
Message-ID: <20231003103712.5703b5e0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/audx8+6=rD2Db8A9QbMBV5E";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS
autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]);
Mon, 02 Oct 2023 16:37:24 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1778688820820639157
X-GMAIL-MSGID: 1778688820820639157
|
| Series |
linux-next: manual merge of the mlx5-next tree with the net-next tree
|
|
Commit Message
Stephen Rothwell
Oct. 2, 2023, 11:37 p.m. UTC
Hi all,
Today's linux-next merge of the mlx5-next tree got a conflict in:
include/linux/mlx5/device.h
between commit:
ac5f395685bd ("net/mlx5: SF, Implement peer devlink set for SF representor devlink port")
from the net-next tree and commit:
0d293714ac32 ("RDMA/mlx5: Send events from IB driver about device affiliation state")
from the mlx5-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.
Comments
On Tue, Oct 03, 2023 at 10:37:12AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > include/linux/mlx5/device.h > > between commit: > > ac5f395685bd ("net/mlx5: SF, Implement peer devlink set for SF representor devlink port") > > from the net-next tree and commit: > > 0d293714ac32 ("RDMA/mlx5: Send events from IB driver about device affiliation state") > > from the mlx5-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. > > -- > Cheers, > Stephen Rothwell > > diff --cc include/linux/mlx5/device.h > index 8fbe22de16ef,26333d602a50..000000000000 > --- a/include/linux/mlx5/device.h > +++ b/include/linux/mlx5/device.h > @@@ -366,7 -366,8 +366,9 @@@ enum mlx5_driver_event > MLX5_DRIVER_EVENT_UPLINK_NETDEV, > MLX5_DRIVER_EVENT_MACSEC_SA_ADDED, > MLX5_DRIVER_EVENT_MACSEC_SA_DELETED, > + MLX5_DRIVER_EVENT_SF_PEER_DEVLINK, > + MLX5_DRIVER_EVENT_AFFILIATION_DONE, > + MLX5_DRIVER_EVENT_AFFILIATION_REMOVED, > }; Thanks a lot > > enum {
diff --cc include/linux/mlx5/device.h index 8fbe22de16ef,26333d602a50..000000000000 --- a/include/linux/mlx5/device.h