The following commit has been merged into the x86/sgx branch of tip: Commit-ID: bab8c183d1d452f5fdc059aef2f0788bd2986231 Gitweb: https://git.kernel.org/tip/bab8c183d1d452f5fdc059aef2f0788bd2986231 Author: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> AuthorDate: Wed, 02 Dec 2020 09:27:14 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Wed, 02 Dec 2020 12:54:47 +01:00 x86/sgx: Fix a typo in kernel-doc markup Fix the following kernel-doc warning: arch/x86/include/uapi/asm/sgx.h:19: warning: expecting prototype \ for enum sgx_epage_flags. Prototype was for enum sgx_page_flags instead [ bp: Launder the commit message. ] Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lkml.kernel.org/r/ca11a4540d981cbd5f026b6cbc8931aa55654e00.1606897462.git.mchehab+huawei@xxxxxxxxxx --- arch/x86/include/uapi/asm/sgx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/sgx.h b/arch/x86/include/uapi/asm/sgx.h index 791e453..9034f30 100644 --- a/arch/x86/include/uapi/asm/sgx.h +++ b/arch/x86/include/uapi/asm/sgx.h @@ -9,7 +9,7 @@ #include <linux/ioctl.h> /** - * enum sgx_epage_flags - page control flags + * enum sgx_page_flags - page control flags * %SGX_PAGE_MEASURE: Measure the page contents with a sequence of * ENCLS[EEXTEND] operations. */