diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-05 15:38:32 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-05 15:38:32 -0700 |
commit | 1df377db3d0131057fa33b4dcda05c3e341308ab (patch) | |
tree | 99ed48d05eb00265bad6225ad602872d425d061f /include/trace | |
parent | 8b6b383c1fa33c7ed49885672cc2ddf61d6b46f0 (diff) | |
parent | e4a02ed2aaf447fa849e3254bfdb3b9b01e1e520 (diff) | |
download | linux-1df377db3d0131057fa33b4dcda05c3e341308ab.tar.bz2 |
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 'include/trace')
0 files changed, 0 insertions, 0 deletions