diff options
author | Linus Torvalds | 2016-03-05 02:36:46 +0100 |
---|---|---|
committer | Linus Torvalds | 2016-03-05 02:36:46 +0100 |
commit | c51797d25d84833804e9e6950c8c1abbe6c73808 (patch) | |
tree | 4b43585feca6e7d76cd67f51799de199ccb43d77 /fs/timerfd.c | |
parent | Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | MAINTAINERS: add maintainer entry for FREESCALE GPMI NAND driver (diff) | |
download | kernel-qcow2-linux-c51797d25d84833804e9e6950c8c1abbe6c73808.tar.gz kernel-qcow2-linux-c51797d25d84833804e9e6950c8c1abbe6c73808.tar.xz kernel-qcow2-linux-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 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions