Merge tag 'devicetree-fixes-for-4.17' into dt/next to pick-up fixes