Merge remote-tracking branch 'asm-generic/master'

diff --cc drivers/block/nvme-core.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/cmd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
Simple merge

diff --cc drivers/net/ethernet/rocker/rocker.c
Simple merge

diff --cc lib/mpi/mpicoder.c
Simple merge