linux-kernel - Re: linux-next: manual merge of the mlx5-next tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20230824185836.5d40fafd@kernel.org>
Date:   Thu, 24 Aug 2023 18:58:36 -0700
From:   Jakub Kicinski <kuba@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Leon Romanovsky <leon@...nel.org>,
        Leon Romanovsky <leonro@...dia.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Patrisious Haddad <phaddad@...dia.com>,
        Saeed Mahameed <saeedm@...dia.com>,
        Zhengchao Shao <shaozhengchao@...wei.com>
Subject: Re: linux-next: manual merge of the mlx5-next tree with Linus' tree

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.