summaryrefslogtreecommitdiffstats
path: root/fs/fuse/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-08 11:04:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-08 11:04:06 -0700
commite72643088f576032d0d30c1d62c8fc077f383edc (patch)
tree5068dd46292b132f6178ced3b9124b27f549b907 /fs/fuse/dir.c
parent32ba9c3fcab960f0b0d332c86ebcd2c4870d9bb8 (diff)
parent12027f1b3fd69a4e9017e6b13c72547a99c6cf54 (diff)
downloadlinux-e72643088f576032d0d30c1d62c8fc077f383edc.tar.gz
linux-e72643088f576032d0d30c1d62c8fc077f383edc.tar.xz
linux-e72643088f576032d0d30c1d62c8fc077f383edc.zip
Merge tag 'upstream-3.5-rc2' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS fixes from Artem Bityutskiy: "Fix UBI and UBIFS - they refuse to work without debugfs. This was broken by the 3.5-rc1 UBI/UBIFS changes when we removed the debugging Kconfig switches. Also, correct locking in 'ubi_wl_flush()' - it was extended to support flushing a specific LEB in 3.5-rc1, and the locking was sub-optimal." * tag 'upstream-3.5-rc2' of git://git.infradead.org/linux-ubifs: UBI: correct ubi_wl_flush locking UBIFS: fix debugfs-less systems support UBI: fix debugfs-less systems support
Diffstat (limited to 'fs/fuse/dir.c')
0 files changed, 0 insertions, 0 deletions