From: Jakub Kicinski <kuba@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Leon Romanovsky <leon@kernel.org>,
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>
Subject: Re: linux-next: manual merge of the mlx5-next tree with Linus' tree
Date: Thu, 24 Aug 2023 18:58:36 -0700 [thread overview]
Message-ID: <20230824185836.5d40fafd@kernel.org> (raw)
In-Reply-To: <20230825110536.41195860@canb.auug.org.au>
On Fri, 25 Aug 2023 11:05:36 +1000 Stephen Rothwell wrote:
> 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?
Ugh, I should have caught it. Let me apply your fix from the list.
next prev parent reply other threads:[~2023-08-25 1:59 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
2023-08-25 1:58 ` Jakub Kicinski [this message]
-- 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=20230824185836.5d40fafd@kernel.org \
--to=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=sfr@canb.auug.org.au \
--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).