The following commit has been merged into the x86/sgx branch of tip: Commit-ID: bc4bac2ecef0e47fd5c02f9c6f9585fd477f9beb Gitweb: https://git.kernel.org/tip/bc4bac2ecef0e47fd5c02f9c6f9585fd477f9beb Author: Jarkko Sakkinen <jarkko@xxxxxxxxxx> AuthorDate: Fri, 13 Nov 2020 00:01:35 +02:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Wed, 18 Nov 2020 18:16:28 +01:00 x86/sgx: Update MAINTAINERS Add the maintainer information for the SGX subsystem. Signed-off-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Acked-by: Jethro Beekman <jethro@xxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20201112220135.165028-25-jarkko@xxxxxxxxxx --- MAINTAINERS | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index e451dcc..44c240c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9126,6 +9126,19 @@ F: Documentation/x86/intel_txt.rst F: arch/x86/kernel/tboot.c F: include/linux/tboot.h +INTEL SGX +M: Jarkko Sakkinen <jarkko@xxxxxxxxxx> +L: linux-sgx@xxxxxxxxxxxxxxx +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 +F: Documentation/x86/sgx.rst +F: arch/x86/entry/vdso/vsgx.S +F: arch/x86/include/uapi/asm/sgx.h +F: arch/x86/kernel/cpu/sgx/* +F: tools/testing/selftests/sgx/* +K: \bSGX_ + INTERCONNECT API M: Georgi Djakov <georgi.djakov@xxxxxxxxxx> L: linux-pm@xxxxxxxxxxxxxxx