From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Mar 2021 19:19:16 +0000 (-0700)
Subject: Merge tag 'x86-urgent-2021-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: Ubuntu-5.13.0-19.19~3644
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=36a14638f7c06546717cc1316fcfee6da42b98cc;p=mirror_ubuntu-jammy-kernel.git

Merge tag 'x86-urgent-2021-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Two fixes:

   - Fix build failure on Ubuntu with new GCC packages that turn
     on -fcf-protection

   - Fix SME memory encryption PTE encoding bug - AFAICT the code
     worked on 4K page sizes (level 1) but had the wrong shift at
     higher page level orders (level 2 and higher)"

* tag 'x86-urgent-2021-03-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Turn off -fcf-protection for realmode targets
  x86/mem_encrypt: Correct physical address calculation in __set_clr_pte_enc()
---

36a14638f7c06546717cc1316fcfee6da42b98cc