Messages in this thread | | | Date | Wed, 15 Jan 2014 13:46:51 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the infiniband tree with the net-next tree |
| |
Hi all,
Today's linux-next merge of the infiniband tree got a conflict in include/linux/mlx4/device.h between commit 7ffdf726cfe0 ("net/mlx4_core: Add basic support for TCP/IP offloads under tunneling") from the net-next tree and commits 4de658036086 ("mlx4_core: Add support for steerable IB UD QPs") and dd5f03beb4f7 ("IB/core: Ethernet L2 attributes in verbs/cm structures") from the infiniband tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/mlx4/device.h index c99ecf6d2c67,ac5cb1d92487..000000000000 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@@ -166,7 -161,7 +166,8 @@@ enum MLX4_DEV_CAP_FLAG2_VLAN_CONTROL = 1LL << 6, MLX4_DEV_CAP_FLAG2_FSM = 1LL << 7, MLX4_DEV_CAP_FLAG2_UPDATE_QP = 1LL << 8, - MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS = 1LL << 9 - MLX4_DEV_CAP_FLAG2_DMFS_IPOIB = 1LL << 9 ++ MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS = 1LL << 9, ++ MLX4_DEV_CAP_FLAG2_DMFS_IPOIB = 1LL << 10 }; enum { @@@ -1130,7 -1096,7 +1131,8 @@@ int mlx4_SET_PORT_qpn_calc(struct mlx4_ int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc); int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw, u8 *pg, u16 *ratelimit); +int mlx4_SET_PORT_VXLAN(struct mlx4_dev *dev, u8 port, u8 steering); + int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx); int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx); int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index); void mlx4_unregister_vlan(struct mlx4_dev *dev, u8 port, u16 vlan); [unhandled content-type:application/pgp-signature] | |