From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Doug Ledford <dledford@redhat.com>, Jason Gunthorpe <jgg@mellanox.com>
Cc: Leon Romanovsky <leon@kernel.org>,
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>,
Maor Gottlieb <maorg@mellanox.com>
Subject: Re: linux-next: manual merge of the mlx5-next tree with Linus' tree
Date: Thu, 20 Jun 2019 13:05:23 +1000 [thread overview]
Message-ID: <20190620130523.176d4ca5@canb.auug.org.au> (raw)
In-Reply-To: <20190617121959.55976690@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1881 bytes --]
Hi all,
On Mon, 17 Jun 2019 12:19:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Leon,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> include/linux/mlx5/eswitch.h
>
> between commit:
>
> 02f3afd97556 ("net/mlx5: E-Switch, Correct type to u16 for vport_num and int for vport_index")
>
> from Linus' tree and commit:
>
> 82b11f071936 ("net/mlx5: Expose eswitch encap mode")
>
> 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/eswitch.h
> index e9a55c0d50fd,174eec0871d9..000000000000
> --- a/include/linux/mlx5/eswitch.h
> +++ b/include/linux/mlx5/eswitch.h
> @@@ -61,5 -62,16 +62,16 @@@ void *mlx5_eswitch_uplink_get_proto_dev
> u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw);
> struct mlx5_flow_handle *
> mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw,
> - int vport, u32 sqn);
> + u16 vport_num, u32 sqn);
> +
> + #ifdef CONFIG_MLX5_ESWITCH
> + enum devlink_eswitch_encap_mode
> + mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev);
> + #else /* CONFIG_MLX5_ESWITCH */
> + static inline enum devlink_eswitch_encap_mode
> + mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev)
> + {
> + return DEVLINK_ESWITCH_ENCAP_MODE_NONE;
> + }
> + #endif /* CONFIG_MLX5_ESWITCH */
> #endif
This is now a conflict between Linus' tree and the rdma tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-06-20 3:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 2:19 linux-next: manual merge of the mlx5-next tree with Linus' tree Stephen Rothwell
2019-06-17 3:53 ` Leon Romanovsky
2019-06-20 3:05 ` Stephen Rothwell [this message]
2019-07-02 3:08 Stephen Rothwell
2019-07-02 3:13 Stephen Rothwell
2019-07-02 4:03 ` Leon Romanovsky
2023-08-15 2:37 Stephen Rothwell
2023-08-25 1:05 ` Stephen Rothwell
2023-08-25 1:58 ` Jakub Kicinski
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=20190620130523.176d4ca5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maorg@mellanox.com \
--cc=parav@mellanox.com \
--cc=saeedm@mellanox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).