Merge tag 'v5.12-rc7' into ecryptfs/next