aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-07-11 15:06:37 -0700
committerDavid S. Miller <davem@davemloft.net>2019-07-11 15:06:37 -0700
commit114a5c3240155fdb01bf821c9d326d7bb05bd464 (patch)
tree55309a5fa85a6b4ff4a6decb689cd8c6a1b78cd4 /include/net/xfrm.h
parentMerge branch 'mlx5-build-fixes' (diff)
parentnet/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn (diff)
downloadlinux-dev-114a5c3240155fdb01bf821c9d326d7bb05bd464.tar.xz
linux-dev-114a5c3240155fdb01bf821c9d326d7bb05bd464.zip
Merge tag 'mlx5-fixes-2019-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says: ==================== Mellanox, mlx5 fixes 2019-07-11 This series introduces some fixes to mlx5 driver. Please pull and let me know if there is any problem. For -stable v4.15 ('net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn') For -stable v5.1 ('net/mlx5e: Fix port tunnel GRE entropy control') ('net/mlx5e: Rx, Fix checksum calculation for new hardware') ('net/mlx5e: Fix return value from timeout recover function') ('net/mlx5e: Fix error flow in tx reporter diagnose') For -stable v5.2 ('net/mlx5: E-Switch, Fix default encap mode') Conflict note: This pull request will produce a small conflict when merged with net-next. In drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c Take the hunk from net and replace: esw_offloads_steering_init(esw, vf_nvports, total_nvports); with: esw_offloads_steering_init(esw); ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/xfrm.h')
0 files changed, 0 insertions, 0 deletions