aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 19:34:23 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-22 19:34:23 -0400
commit4f3a29dadaf999a273f1e7fe2476595d0283eef3 (patch)
tree3776499f6edc95a36533c7efe32a7b6038c88b61 /block/blk-merge.c
parent06d362931a530e0d48c1a9554a752da4ed240f0b (diff)
parent45aafd32996e27bfc4862654ff31231bdddbe200 (diff)
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6: UBI: tighten the corrupted PEB criteria UBI: fix check_data_ff return code UBI: remember copy_flag while scanning UBI: preserve corrupted PEBs UBI: add truly corrupted PEBs to corrupted list UBI: introduce debugging helper function UBI: make check_pattern function non-static UBI: do not put eraseblocks to the corrupted list unnecessarily UBI: separate out corrupted list UBI: change cascade of ifs to switch statements UBI: rename a local variable UBI: handle bit-flips when no header found UBI: remove duplicate IO error codes UBI: rename IO error code UBI: fix small 80 characters limit style issue UBI: cleanup and simplify Kconfig
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions