From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Aug 2022 19:15:27 +0000 (-0700)
Subject: Merge tag 'locking-core-2022-08-01' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: baikal/mips/sdk6.1~5214
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=26e296da61c553696aff4db143e6738d07c0e3ce;p=kernel.git

Merge tag 'locking-core-2022-08-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking updates from Ingo Molnar:
 "This was a fairly quiet cycle for the locking subsystem:

   - lockdep: Fix a handful of the more complex lockdep_init_map_*()
     primitives that can lose the lock_type & cause false reports. No
     such mishap was observed in the wild.

   - jump_label improvements: simplify the cross-arch support of initial
     NOP patching by making it arch-specific code (used on MIPS only),
     and remove the s390 initial NOP patching that was superfluous"

* tag 'locking-core-2022-08-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/lockdep: Fix lockdep_init_map_*() confusion
  jump_label: make initial NOP patching the special case
  jump_label: mips: move module NOP patching into arch code
  jump_label: s390: avoid pointless initial NOP patching
---

26e296da61c553696aff4db143e6738d07c0e3ce