| Message ID | 20190812122106.628debfd@canb.auug.org.au |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index deeb65da99f3,5be3da621499..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
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: 93b3586e070b ("net/mlx5: Support inner header match criteria for non decap flow action") from the net tree and commit: 226f2ca3075a ("net/mlx5e: Change flow flags type to unsigned long") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.