Merge remote-tracking branch 'tejun/for-6.9' into dm-6.9-bh-wq