diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-08 20:04:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-08 20:04:06 +0200 |
| commit | e72643088f576032d0d30c1d62c8fc077f383edc (patch) | |
| tree | 5068dd46292b132f6178ced3b9124b27f549b907 /arch/x86 | |
| parent | Revert "vfs: stop d_splice_alias creating directory aliases" (diff) | |
| parent | UBI: correct ubi_wl_flush locking (diff) | |
| download | 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 'arch/x86')
0 files changed, 0 insertions, 0 deletions