From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Jun 2022 18:00:43 +0000 (-0700)
Subject: Merge tag 'x86-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: baikal/mips/sdk6.1~5544
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=cc5128e65f603d37d93228360f19c9954292f5c4;p=kernel.git

Merge tag 'x86-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 SGX fix from Thomas Gleixner:
 "A single fix for x86/SGX to prevent that memory which is allocated for
  an SGX enclave is accounted to the wrong memory control group"

* tag 'x86-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/sgx: Set active memcg prior to shmem allocation
---

cc5128e65f603d37d93228360f19c9954292f5c4