From: Saeed Mahameed <sae...@mellanox.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.
