x86: copy 5.15 patches to 6.1