summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-05 15:38:32 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-05 15:38:32 -0700
commit1df377db3d0131057fa33b4dcda05c3e341308ab (patch)
tree99ed48d05eb00265bad6225ad602872d425d061f /MAINTAINERS
parent8b6b383c1fa33c7ed49885672cc2ddf61d6b46f0 (diff)
parente4a02ed2aaf447fa849e3254bfdb3b9b01e1e520 (diff)
downloadlinux-1df377db3d0131057fa33b4dcda05c3e341308ab.tar.gz
linux-1df377db3d0131057fa33b4dcda05c3e341308ab.tar.bz2
linux-1df377db3d0131057fa33b4dcda05c3e341308ab.zip
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Ingo writes: "locking fixes: A fix in the ww_mutex self-test that produces a scary splat, plus an updates to the maintained-filed patters in MAINTAINER." * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: locking/ww_mutex: Fix runtime warning in the WW mutex selftest MAINTAINERS: Remove dead path from LOCKING PRIMITIVES entry
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 22065048d89d..e2d974963359 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8599,7 +8599,6 @@ F: include/linux/spinlock*.h
F: arch/*/include/asm/spinlock*.h
F: include/linux/rwlock*.h
F: include/linux/mutex*.h
-F: arch/*/include/asm/mutex*.h
F: include/linux/rwsem*.h
F: arch/*/include/asm/rwsem.h
F: include/linux/seqlock.h