netdev - Re: [pull request][net-next 00/13] Mellanox, mlx5 CT updates 2020-07-09

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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20200710.141204.1000719994162068882.davem@davemloft.net>
Date:   Fri, 10 Jul 2020 14:12:04 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     saeedm@...lanox.com
Cc:     kuba@...nel.org, netdev@...r.kernel.org
Subject: Re: [pull request][net-next 00/13] Mellanox, mlx5 CT updates
 2020-07-09

From: Saeed Mahameed <saeedm@...lanox.com>
Date: Thu,  9 Jul 2020 20:44:19 -0700

> This series provides updates to mlx5 CT (connection tracking) offloads
> For more information please see tag log below.
> 
> Please pull and let me know if there is any problem.

Pulled.

> The following conflict is expected when net is merged into net-next:
> to resolve just use the hunks from net-next.
> 
> <<<<<<< HEAD (net-next)
> 	mlx5_tc_ct_del_ft_entry(ct_priv, entry);
> 	kfree(entry);
> ======= (net)
> 	mlx5_tc_ct_entry_del_rules(ct_priv, entry);
> 	kfree(entry);
>>>>>>>> b1a7d5bdfe54c98eca46e2c997d4e3b1484a49af

Thanks for this.

If you could put this info into the merge commit message I'd appreciate it.

I added it in by hand this time.

Thanks again.