From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Nov 2021 22:54:07 +0000 (-0700)
Subject: Merge tag 'x86_sgx_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.1-rc5~2793
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=879dbe9ffebc1328717cd66eab7e4918a3f499bd;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'x86_sgx_for_v5.16_rc1' of git://git./linux/kernel/git/tip/tip

Pull x86 SGX updates from Borislav Petkov:
 "Add a SGX_IOC_VEPC_REMOVE ioctl to the /dev/sgx_vepc virt interface
  with which EPC pages can be put back into their uninitialized state
  without having to reopen /dev/sgx_vepc, which could not be possible
  anymore after startup due to security policies"

* tag 'x86_sgx_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/sgx/virt: implement SGX_IOC_VEPC_REMOVE ioctl
  x86/sgx/virt: extract sgx_vepc_remove_page
---

879dbe9ffebc1328717cd66eab7e4918a3f499bd