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
Date: Tue, 3 Oct 2023 10:37:12 +1100 [thread overview]
Message-ID: <20231003103712.5703b5e0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]
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,
};
enum {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-10-02 23:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 23:37 Stephen Rothwell [this message]
2023-10-03 10:17 ` linux-next: manual merge of the mlx5-next tree with the net-next tree Leon Romanovsky
-- strict thread matches above, loose matches on Subject: below --
2023-08-15 2:28 Stephen Rothwell
2023-02-01 22:14 Stephen Rothwell
2023-02-02 8:26 ` Leon Romanovsky
2022-09-15 0:20 Stephen Rothwell
2022-09-15 0:15 Stephen Rothwell
2019-06-27 4:09 Stephen Rothwell
2019-06-27 22:59 ` Saeed Mahameed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231003103712.5703b5e0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=jiri@nvidia.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=phaddad@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.