Commit 573efdc5 authored Mar 31, 2019 by Linus Torvalds

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fixlet from Thomas Gleixner:
 "Trivial update to the maintainers file"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  MAINTAINERS: Remove deleted file from futex file pattern

parents f78b5be2 93a64ee7

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -6408,7 +6408,6 @@ L: linux-kernel@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
		S: Maintained
		F: kernel/futex.c
		F: kernel/futex_compat.c
		F: include/asm-generic/futex.h
		F: include/linux/futex.h
		F: include/uapi/linux/futex.h