Merge tag 'efi-next-for-v6.1' into loongarch-next