Commit 463b1b2a authored Jul 06, 2025 by Linus Torvalds

Merge tag 'locking_urgent_for_v6.16_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fixes from Borislav Petkov:

 - Disable FUTEX_PRIVATE_HASH for this cycle due to a performance
   regression

 - Add a selftests compilation product to the corresponding .gitignore
   file

* tag 'locking_urgent_for_v6.16_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  selftests/futex: Add futex_numa to .gitignore
  futex: Temporary disable FUTEX_PRIVATE_HASH

parents c92bda4c 46b0a67e

init/Kconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -1716,9 +1716,13 @@ config FUTEX_PI
		depends on FUTEX && RT_MUTEXES
		default y

		#
		# marked broken for performance reasons; gives us one more cycle to sort things out.
		#
		config FUTEX_PRIVATE_HASH
		bool
		depends on FUTEX && !BASE_SMALL && MMU
		depends on BROKEN
		default y

		config FUTEX_MPOL

tools/testing/selftests/futex/functional/.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,4 @@ futex_wait_timeout
		futex_wait_uninitialized_heap
		futex_wait_wouldblock
		futex_waitv
		futex_numa