Merge tag 'armsoc-dt' into test-merge