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 for Android: free password hash cracker in your pocket

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

Date:   Tue, 14 Jul 2020 05:11:31 +0000
From:   Saeed Mahameed <saeedm@...lanox.com>
To:     "davem@...emloft.net" <davem@...emloft.net>
CC:     "kuba@...nel.org" <kuba@...nel.org>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [pull request][net-next 00/13] Mellanox, mlx5 CT updates
 2020-07-09

On Fri, 2020-07-10 at 14:12 -0700, David Miller wrote:
> 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.
> 

Sure i can do this.

But at the time of this submission there wasn't any conflict, and I
couldn't determine ahead of time if you are going to merge net or this
pull request first.


> I added it in by hand this time.
> 
> Thanks again.