]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'locking_urgent_for_v6.13_rc3' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Dec 2024 18:34:41 +0000 (10:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Dec 2024 18:34:41 +0000 (10:34 -0800)
Pull locking fixes from Borislav Petkov:

 - Remove if_not_guard() as it is generating incorrect code

 - Fix the initialization of the fake lockdep_map for the first locked
   ww_mutex

* tag 'locking_urgent_for_v6.13_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  headers/cleanup.h: Remove the if_not_guard() facility
  locking/ww_mutex: Fix ww_mutex dummy lockdep map selftest warnings


Trivial merge