From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Leon Romanovsky <leon@kernel.org>
Cc: Leon Romanovsky <leonro@nvidia.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Patrisious Haddad <phaddad@nvidia.com>,
Saeed Mahameed <saeedm@nvidia.com>,
Zhengchao Shao <shaozhengchao@huawei.com>,
Jakub Kicinski <kuba@kernel.org>
Subject: Re: linux-next: manual merge of the mlx5-next tree with Linus' tree
Date: Fri, 25 Aug 2023 11:05:36 +1000 [thread overview]
Message-ID: <20230825110536.41195860@canb.auug.org.au> (raw)
In-Reply-To: <20230815123725.4ef5b7b9@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2223 bytes --]
Hi all,
On Tue, 15 Aug 2023 12:37:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c
>
> between commit:
>
> aeb660171b06 ("net/mlx5e: fix double free in macsec_fs_tx_create_crypto_table_groups")
>
> from Linus' tree and commit:
>
> cb5ebe4896f9 ("net/mlx5e: Move MACsec flow steering operations to be used as core library")
>
> from the mlx5-next tree.
>
> I fixed it up (I removed this file and added the following patch) 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 15 Aug 2023 12:34:29 +1000
> Subject: [PATCH] fix up for "net/mlx5e: Move MACsec flow steering operations to be used as core library"
>
> interacting with commit
>
> aeb660171b06 ("net/mlx5e: fix double free in macsec_fs_tx_create_crypto_table_groups")
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
> index 2f2cb67717cd..4a078113e292 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c
> @@ -278,6 +278,7 @@ static int macsec_fs_tx_create_crypto_table_groups(struct mlx5_macsec_flow_table
>
> if (!in) {
> kfree(ft->g);
> + ft->g = NULL;
> return -ENOMEM;
> }
>
> --
> 2.40.1
Was the second part of this resolution (i.e. the update to
drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c) missed, or
deemed unnecessary after the mlx5-next tree was merged into the
net-next tree?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-08-25 1:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2023-08-25 1:58 ` Jakub Kicinski
-- strict thread matches above, loose matches on Subject: below --
2019-07-02 3:13 Stephen Rothwell
2019-07-02 4:03 ` Leon Romanovsky
2019-07-02 3:08 Stephen Rothwell
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=20230825110536.41195860@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=leonro@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=phaddad@nvidia.com \
--cc=saeedm@nvidia.com \
--cc=shaozhengchao@huawei.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).