Merge tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS changes from Artem Bityutskiy: "No significant changes, mostly small fixes here and there. The more important fixes are: - UBI deleted list items while iterating the list with 'list_for_each_entry' - The UBI block driver did not work properly with very large UBI volumes" * tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs: (21 commits) UBIFS: Add log overlap assertions Revert "UBIFS: add a log overlap assertion" UBI: bugfix in ubi_wl_flush() UBI: block: Avoid disk size integer overflow UBI: block: Set disk_capacity out of the mutex UBI: block: Make ubiblock_resize return something UBIFS: add a log overlap assertion UBIFS: remove unnecessary check UBIFS: remove mst_mutex UBIFS: kernel-doc warning fix UBI: init_volumes: Ignore volumes with no LEBs UBIFS: replace seq_printf by seq_puts UBIFS: replace count*size kzalloc by kcalloc UBIFS: kernel-doc warning fix UBIFS: fix error path in create_default_filesystem() UBIFS: fix spelling of "scanned" UBIFS: fix some comments UBIFS: remove useless @ecc in struct ubifs_scan_leb UBIFS: remove useless statements UBIFS: Add missing break statements in dbg_chk_pnode() ...
Showing
- drivers/mtd/ubi/block.c 12 additions, 6 deletionsdrivers/mtd/ubi/block.c
- drivers/mtd/ubi/vtbl.c 1 addition, 1 deletiondrivers/mtd/ubi/vtbl.c
- drivers/mtd/ubi/wl.c 2 additions, 2 deletionsdrivers/mtd/ubi/wl.c
- fs/ubifs/commit.c 0 additions, 2 deletionsfs/ubifs/commit.c
- fs/ubifs/io.c 1 addition, 1 deletionfs/ubifs/io.c
- fs/ubifs/log.c 6 additions, 6 deletionsfs/ubifs/log.c
- fs/ubifs/lpt.c 2 additions, 3 deletionsfs/ubifs/lpt.c
- fs/ubifs/lpt_commit.c 5 additions, 2 deletionsfs/ubifs/lpt_commit.c
- fs/ubifs/master.c 3 additions, 4 deletionsfs/ubifs/master.c
- fs/ubifs/orphan.c 0 additions, 1 deletionfs/ubifs/orphan.c
- fs/ubifs/recovery.c 2 additions, 3 deletionsfs/ubifs/recovery.c
- fs/ubifs/sb.c 3 additions, 1 deletionfs/ubifs/sb.c
- fs/ubifs/scan.c 7 additions, 7 deletionsfs/ubifs/scan.c
- fs/ubifs/super.c 9 additions, 10 deletionsfs/ubifs/super.c
- fs/ubifs/tnc.c 0 additions, 1 deletionfs/ubifs/tnc.c
- fs/ubifs/tnc_commit.c 0 additions, 1 deletionfs/ubifs/tnc_commit.c
- fs/ubifs/ubifs.h 0 additions, 4 deletionsfs/ubifs/ubifs.h
Please register or sign in to comment