OSDN Git Service

Merge branch 'ct-offload' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed...
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Mar 2020 19:34:23 +0000 (12:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Mar 2020 19:34:23 +0000 (12:34 -0700)
commitbf3347c4d15e26ab17fce3aa4041345198f4280c
treee7dca5ea4e7bdb3e5892ab64e0f335f1219595f1
parent93e616131a3825189570524d4792b5223bf1d68c
parentb8ce90370977dbe24d2ed7271b65710ec9c40166
Merge branch 'ct-offload' of git://git./linux/kernel/git/saeed/linux
14 files changed:
drivers/infiniband/hw/mlx5/main.c
drivers/net/ethernet/mellanox/mlx5/core/Makefile
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_chains.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_chains.h
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
include/net/pkt_cls.h
net/core/dev.c
net/sched/cls_api.c