From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Leon Romanovsky <leon@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Parav Pandit <parav@mellanox•com>,
Saeed Mahameed <saeedm@mellanox•com>,
Bodong Wang <bodong@mellanox•com>
Subject: linux-next: manual merge of the mlx5-next tree with Linus' tree
Date: Tue, 2 Jul 2019 13:08:28 +1000 [thread overview]
Message-ID: <20190702130828.5f2f7f4a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1344 bytes --]
Hi all,
Today's linux-next merge of the mlx5-next tree got conflicts in:
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
between commits:
02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and int for vport_index")
from Linus' tree and commit:
5f5d2536be8d ("net/mlx5: E-Switch, Use correct flags when configuring vlan")
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.c
index 67e76979bb42,89f52370e770..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@@ -1552,7 -1552,8 +1552,8 @@@ static void node_guid_gen_from_mac(u64
static void esw_apply_vport_conf(struct mlx5_eswitch *esw,
struct mlx5_vport *vport)
{
- int vport_num = vport->vport;
+ u16 vport_num = vport->vport;
+ int flags;
if (esw->manager_vport == vport_num)
return;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-07-02 3:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-02 3:08 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-15 2:37 linux-next: manual merge of the mlx5-next tree with Linus' tree Stephen Rothwell
2023-08-25 1:05 ` Stephen Rothwell
2023-08-25 1:58 ` Jakub Kicinski
2019-07-02 3:13 Stephen Rothwell
2019-07-02 4:03 ` Leon Romanovsky
2019-06-17 2:19 Stephen Rothwell
2019-06-17 3:53 ` Leon Romanovsky
2019-06-20 3:05 ` Stephen Rothwell
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=20190702130828.5f2f7f4a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bodong@mellanox$(echo .)com \
--cc=leon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=parav@mellanox$(echo .)com \
--cc=saeedm@mellanox$(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