diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-04 17:36:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-04 17:36:46 -0800 |
| commit | c51797d25d84833804e9e6950c8c1abbe6c73808 (patch) | |
| tree | 4b43585feca6e7d76cd67f51799de199ccb43d77 /MAINTAINERS | |
| parent | 2cdcb2b5b5d6d7c1bdefbc1a63187d47fd809408 (diff) | |
| parent | 44248affb5d82d32cdb58a92a94ce191d4ddee60 (diff) | |
| download | linux-stable-c51797d25d84833804e9e6950c8c1abbe6c73808.tar.gz linux-stable-c51797d25d84833804e9e6950c8c1abbe6c73808.tar.bz2 linux-stable-c51797d25d84833804e9e6950c8c1abbe6c73808.zip | |
Merge tag 'for-linus-20160304' of git://git.infradead.org/linux-mtd
Pull jffs2 fixes from David Woodhouse:
"This contains two important JFFS2 fixes marked for stable:
- a lock ordering problem between the page lock and the internal
f->sem mutex, which was causing occasional deadlocks in garbage
collection
- a scan failure causing moved directories to sometimes end up
appearing to have hard links.
There are also a couple of trivial MAINTAINERS file updates"
* tag 'for-linus-20160304' of git://git.infradead.org/linux-mtd:
MAINTAINERS: add maintainer entry for FREESCALE GPMI NAND driver
Fix directory hardlinks from deleted directories
jffs2: Fix page lock / f->sem deadlock
Revert "jffs2: Fix lock acquisition order bug in jffs2_write_begin"
MAINTAINERS: update Han's email
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index da3e4d8016d0..f5e6a535bc34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4518,6 +4518,12 @@ L: linuxppc-dev@lists.ozlabs.org S: Maintained F: drivers/dma/fsldma.* +FREESCALE GPMI NAND DRIVER +M: Han Xu <han.xu@nxp.com> +L: linux-mtd@lists.infradead.org +S: Maintained +F: drivers/mtd/nand/gpmi-nand/* + FREESCALE I2C CPM DRIVER M: Jochen Friedrich <jochen@scram.de> L: linuxppc-dev@lists.ozlabs.org @@ -4534,7 +4540,7 @@ F: include/linux/platform_data/video-imxfb.h F: drivers/video/fbdev/imxfb.c FREESCALE QUAD SPI DRIVER -M: Han Xu <han.xu@freescale.com> +M: Han Xu <han.xu@nxp.com> L: linux-mtd@lists.infradead.org S: Maintained F: drivers/mtd/spi-nor/fsl-quadspi.c |