diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-21 10:18:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-21 10:18:16 -0700 |
| commit | b7b8a44f3abab51cc2772c5ced2fe2f51a1ad2b8 (patch) | |
| tree | 74c81a259f9365273ca6b0fa28aee7c71e2fdb46 /MAINTAINERS | |
| parent | cf24242189b935826a88feedb64761cbf483e42c (diff) | |
| parent | 6f828c55e26769666e0ae56b037f948dc26fe0d4 (diff) | |
| download | linux-b7b8a44f3abab51cc2772c5ced2fe2f51a1ad2b8.tar.gz | |
Merge tag 'char-misc-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH: "Here are a number of small driver fixes for 5.2-rc6 Nothing major, just fixes for reported issues: - soundwire fixes - thunderbolt fixes - MAINTAINERS update for fpga maintainer change - binder bugfix - habanalabs 64bit pointer fix - documentation updates All of these have been in linux-next with no reported issues" * tag 'char-misc-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: habanalabs: use u64_to_user_ptr() for reading user pointers doc: fix documentation about UIO_MEM_LOGICAL using MAINTAINERS / Documentation: Thorsten Scherer is the successor of Gavin Schenk docs: fb: Add TER16x32 to the available font names MAINTAINERS: fpga: hand off maintainership to Moritz thunderbolt: Implement CIO reset correctly for Titan Ridge binder: fix possible UAF when freeing buffer thunderbolt: Make sure device runtime resume completes before taking domain lock soundwire: intel: set dai min and max channels correctly soundwire: stream: fix bad unlock balance soundwire: stream: fix out of boundary access on port properties
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 46d3497af51f..d0ed735994a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6234,7 +6234,6 @@ F: include/linux/ipmi-fru.h K: fmc_d.*register FPGA MANAGER FRAMEWORK -M: Alan Tull <atull@kernel.org> M: Moritz Fischer <mdf@kernel.org> L: linux-fpga@vger.kernel.org S: Maintained @@ -14404,7 +14403,7 @@ F: lib/test_siphash.c F: include/linux/siphash.h SIOX -M: Gavin Schenk <g.schenk@eckelmann.de> +M: Thorsten Scherer <t.scherer@eckelmann.de> M: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> R: Pengutronix Kernel Team <kernel@pengutronix.de> S: Supported |