Merge branch into tip/master: 'x86/sgx'

Merge branch into tip/master: 'x86/sgx'

* x86/sgx:
    2056e2989bf4 x86/sgx: Fix NULL pointer dereference on non-SGX systems
    572a0a647b9b selftests/sgx: Fix corrupted cpuid macro invocation
    50468e431335 x86/sgx: Add an attribute for the amount of SGX memory in a NUMA node
    5c16f7ee03c0 Merge branch 'x86/urgent' into x86/sgx, to resolve conflict
    379e4de9e140 x86/sgx: Fix minor documentation issues
    688542e29fae selftests/sgx: Add test for multiple TCS entry
    26e688f1263a selftests/sgx: Enable multiple thread support
    abc5cec47350 selftests/sgx: Add page permission and exception test
    c085dfc7685c selftests/sgx: Rename test properties in preparation for more enclave tests
    41493a095e48 selftests/sgx: Provide per-op parameter structs for the test enclave
    f0ff2447b861 selftests/sgx: Add a new kselftest: Unclobbered_vdso_oversubscribed
    065825db1fd6 selftests/sgx: Move setup_test_encl() to each TEST_F()
    1b35eb719549 selftests/sgx: Encpsulate the test enclave creation
    147172148909 selftests/sgx: Dump segments and /proc/self/maps only on failure
    3200505d4de6 selftests/sgx: Create a heap for the test enclave
    5f0ce664d8c6 selftests/sgx: Make data measurement for an enclave segment optional
    39f62536be2f selftests/sgx: Assign source for each segment
    5064343fb155 selftests/sgx: Fix a benign linker warning
    3ad6fd77a2d6 x86/sgx: Add check for SGX pages to ghes_do_memory_failure()
    c6acb1e7bf46 x86/sgx: Add hook to error injection address validation
    03b122da74b2 x86/sgx: Hook arch_memory_failure() into mainline code
    a495cbdffa30 x86/sgx: Add SGX infrastructure to recover from poison
    992801ae9243 x86/sgx: Initial poison handling for dirty and free pages
    40e0e7843e23 x86/sgx: Add infrastructure to identify SGX EPC pages
    d6d261bded8a x86/sgx: Add new sgx_epc_page flag bit to mark free pages

Signed-off-by: Ingo Molnar <mingo@kernel.org>