Messages in this thread | | | Date | Thu, 7 Feb 2019 19:36:20 +0100 | From | Pablo Neira Ayuso <> | Subject | Re: linux-next: manual merge of the net-next tree with the net tree |
| |
Hi Stephen,
On Thu, Feb 07, 2019 at 11:54:24AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > > between commit: > > 1651925d403e ("net/mlx5e: Use the inner headers to determine tc/pedit offload limitation on decap flows") > > from the net tree and commit: > > 738678817573 ("drivers: net: use flow action infrastructure") > > from the net-next tree.
This conflict resolution when merging net into net-next looks good to me.
Thanks.
| |