diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 19:13:18 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 19:13:18 -0800 |
commit | 4bf0b820d146682d997248ff1d49665475f9df16 (patch) | |
tree | 7d16694a0a9f7bb688e07241b4ee3f1d5098e228 /MAINTAINERS | |
parent | 70cd33d34c6026cbc2efb172f8063fccb2ebeb9a (diff) | |
parent | 848477782bfa2b6aec738045246abd6cd104006c (diff) | |
download | linux-4bf0b820d146682d997248ff1d49665475f9df16.tar.bz2 |
Merge tag 'x86_sgx_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 SGX fixes from Borislav Petkov:
"Random small fixes which missed the initial SGX submission. Also, some
procedural clarifications"
* tag 'x86_sgx_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
MAINTAINERS: Add Dave Hansen as reviewer for INTEL SGX
x86/sgx: Drop racy follow_pfn() check
MAINTAINERS: Fix the tree location for INTEL SGX patches
x86/sgx: Fix the return type of sgx_init()
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 41e2cba9b96f..e4a24ea18fe9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9183,10 +9183,11 @@ F: include/linux/tboot.h INTEL SGX M: Jarkko Sakkinen <jarkko@kernel.org> +R: Dave Hansen <dave.hansen@linux.intel.com> L: linux-sgx@vger.kernel.org S: Supported Q: https://patchwork.kernel.org/project/intel-sgx/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-sgx.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx F: Documentation/x86/sgx.rst F: arch/x86/entry/vdso/vsgx.S F: arch/x86/include/uapi/asm/sgx.h |