diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-14 05:43:43 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-14 05:43:43 -1000 |
| commit | 45d9ab8a306bd096faad32cd43a814b40e91870a (patch) | |
| tree | 38bbe7c40548130a61e04623439835a2ffe6cb2e /MAINTAINERS | |
| parent | 319cbacfc0f272297849ce61d36557a408bb3771 (diff) | |
| parent | 65aac17423284634169489f298169c3e3f099cc7 (diff) | |
| download | linux-stable-45d9ab8a306bd096faad32cd43a814b40e91870a.tar.gz linux-stable-45d9ab8a306bd096faad32cd43a814b40e91870a.tar.bz2 linux-stable-45d9ab8a306bd096faad32cd43a814b40e91870a.zip | |
Merge tag 'staging-4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging/IIO driver fixes from Greg KH:
"Here are a few small staging and iio driver fixes for -rc4.
Nothing major, just a few small bugfixes for some reported issues, and
a MAINTAINERS file update for the fbtft drivers.
We also re-enable the building of the erofs filesystem as the XArray
patches that were causing it to break never got merged in the -rc1
cycle, so there's no reason it can't be turned back on for now. The
problem that was previously there is now being handled in the Xarray
tree at the moment, so it will not hit us again in the future.
All of these patches have been in linux-next with no reported issues"
* tag 'staging-4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: vboxvideo: Change address of scanout buffer on page-flip
staging: vboxvideo: Fix IRQs no longer working
staging: gasket: TODO: re-implement using UIO
staging/fbtft: Update TODO and mailing lists
staging: erofs: rename superblock flags (MS_xyz -> SB_xyz)
iio: imu: st_lsm6dsx: take into account ts samples in wm configuration
Revert "iio: temperature: maxim_thermocouple: add MAX31856 part"
Revert "staging: erofs: disable compiling temporarile"
MAINTAINERS: Switch a maintainer for drivers/staging/gasket
staging: wilc1000: revert "fix TODO to compile spi and sdio components in single module"
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bb65f0c1861c..3d92ea976f5e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5625,6 +5625,8 @@ F: lib/fault-inject.c FBTFT Framebuffer drivers M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +L: dri-devel@lists.freedesktop.org +L: linux-fbdev@vger.kernel.org S: Maintained F: drivers/staging/fbtft/ @@ -6060,7 +6062,7 @@ F: Documentation/gcc-plugins.txt GASKET DRIVER FRAMEWORK M: Rob Springer <rspringer@google.com> -M: John Joseph <jnjoseph@google.com> +M: Todd Poynor <toddpoynor@google.com> M: Ben Chan <benchan@chromium.org> S: Maintained F: drivers/staging/gasket/ |