From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Feb 2021 03:13:18 +0000 (-0800)
Subject: Merge tag 'x86_sgx_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4bf0b820d146682d997248ff1d49665475f9df16;p=uclinux-h8%2Flinux.git

Merge tag 'x86_sgx_for_v5.12' of git://git./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()
---

4bf0b820d146682d997248ff1d49665475f9df16