Merge tag 'bcm2835-defconfig-next-2018-04-30' into defconfig/next