Merge branch 'linus' into efi/core, to refresh the branch and to pick up recent fixes