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: Adithya Jayachandran <ajayachandra@nvidia•com>,
Daniel Jurgens <danielj@nvidia•com>,
Saeed Mahameed <saeedm@nvidia•com>,
Tariq Toukan <tariqt@nvidia•com>,
Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the mlx5-next tree with the net-next tree
Date: Mon, 18 Aug 2025 10:41:17 +1000 [thread overview]
Message-ID: <20250818104117.33a7c49b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1478 bytes --]
Hi all,
Today's linux-next merge of the mlx5-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
between commit:
520369ef43a8 ("net/mlx5: Support disabling host PFs")
from the net-next tree and commit:
1baf30426553 ("net/mlx5: E-Switch, Set/Query hca cap via vhca id")
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 drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 6c72080ac2a1,f47389629c62..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@@ -968,11 -975,12 +977,18 @@@ static inline bool mlx5_eswitch_block_i
static inline void mlx5_eswitch_unblock_ipsec(struct mlx5_core_dev *dev) {}
+static inline bool
+mlx5_esw_host_functions_enabled(const struct mlx5_core_dev *dev)
+{
+ return true;
+}
++
+ static inline bool
+ mlx5_esw_vport_vhca_id(struct mlx5_eswitch *esw, u16 vportn, u16 *vhca_id)
+ {
+ return -EOPNOTSUPP;
+ }
+
#endif /* CONFIG_MLX5_ESWITCH */
#endif /* __MLX5_ESWITCH_H__ */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-08-18 0:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-18 0:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-02 23:37 linux-next: manual merge of the mlx5-next tree with the net-next tree Stephen Rothwell
2023-10-03 10:17 ` Leon Romanovsky
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=20250818104117.33a7c49b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ajayachandra@nvidia$(echo .)com \
--cc=danielj@nvidia$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=leon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=saeedm@nvidia$(echo .)com \
--cc=tariqt@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox