Merge branch 'testing_upstream' into testing_nvme

diff --cc arch/mips/dts/baikal_bfk3.dts
Simple merge

diff --cc configs/baikal_bfk3_defconfig
Simple merge

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