Messages in this thread | | | Date | Mon, 4 Aug 2014 14:03:29 +1000 | 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 2599d8580f93 ("net/mlx4_core: Use low memory profile on kdump kernel") from the net-next tree and commit e630664c8383 ("mlx4_core: Add helper functions to support MR re-registration") 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 e15b1544ea83,bac002167ace..000000000000 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@@ -1254,11 -1244,19 +1255,26 @@@ int mlx4_vf_smi_enabled(struct mlx4_de int mlx4_vf_get_enable_smi_admin(struct mlx4_dev *dev, int slave, int port); int mlx4_vf_set_enable_smi_admin(struct mlx4_dev *dev, int slave, int port, int enable); + int mlx4_mr_hw_get_mpt(struct mlx4_dev *dev, struct mlx4_mr *mmr, + struct mlx4_mpt_entry ***mpt_entry); + int mlx4_mr_hw_write_mpt(struct mlx4_dev *dev, struct mlx4_mr *mmr, + struct mlx4_mpt_entry **mpt_entry); + int mlx4_mr_hw_change_pd(struct mlx4_dev *dev, struct mlx4_mpt_entry *mpt_entry, + u32 pdn); + int mlx4_mr_hw_change_access(struct mlx4_dev *dev, + struct mlx4_mpt_entry *mpt_entry, + u32 access); + void mlx4_mr_hw_put_mpt(struct mlx4_dev *dev, + struct mlx4_mpt_entry **mpt_entry); + void mlx4_mr_rereg_mem_cleanup(struct mlx4_dev *dev, struct mlx4_mr *mr); + int mlx4_mr_rereg_mem_write(struct mlx4_dev *dev, struct mlx4_mr *mr, + u64 iova, u64 size, int npages, + int page_shift, struct mlx4_mpt_entry *mpt_entry); + +/* Returns true if running in low memory profile (kdump kernel) */ +static inline bool mlx4_low_memory_profile(void) +{ + return reset_devices; +} + #endif /* MLX4_DEVICE_H */ [unhandled content-type:application/pgp-signature] | |