From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Oct 2022 16:30:35 +0000 (-0700)
Subject: Merge tag 'x86_urgent_for_v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: baikal/mips/sdk6.1~4790
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=62ead33812e3746737c89a551246caf251e6d5e0;p=kernel.git

Merge tag 'x86_urgent_for_v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov:

 - Add the respective UP last level cache mask accessors in order not to
   cause segfaults when lscpu accesses their representation in sysfs

 - Fix for a race in the alternatives batch patching machinery when
   kprobes are set

* tag 'x86_urgent_for_v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cacheinfo: Add a cpu_llc_shared_mask() UP variant
  x86/alternative: Fix race in try_get_desc()
---

62ead33812e3746737c89a551246caf251e6d5e0