diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-15 18:39:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-15 18:39:09 +0200 |
commit | ca062f8df5d13e3a5c029449a12c20ac5069c094 (patch) | |
tree | a5733e0740f9215d47ae98bfd181281b317c642c /MAINTAINERS | |
parent | Merge tag '4.19-rc3-smb3-cifs' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
parent | locking/ww_mutex: Fix spelling mistake "cylic" -> "cyclic" (diff) | |
download | linux-ca062f8df5d13e3a5c029449a12c20ac5069c094.tar.xz linux-ca062f8df5d13e3a5c029449a12c20ac5069c094.zip |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"Misc fixes: liblockdep fixes and ww_mutex fixes"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/ww_mutex: Fix spelling mistake "cylic" -> "cyclic"
locking/lockdep: Delete unnecessary #include
tools/lib/lockdep: Add dummy task_struct state member
tools/lib/lockdep: Add empty nmi.h
tools/lib/lockdep: Update Sasha Levin email to MSFT
jump_label: Fix typo in warning message
locking/mutex: Fix mutex debug call and ww_mutex documentation
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3d92ea976f5e..4ece30f15777 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8316,7 +8316,7 @@ F: include/linux/libata.h F: Documentation/devicetree/bindings/ata/ LIBLOCKDEP -M: Sasha Levin <alexander.levin@verizon.com> +M: Sasha Levin <alexander.levin@microsoft.com> S: Maintained F: tools/lib/lockdep/ |