Skip to content
  • Linus Torvalds's avatar
    Merge tag 'upstream-3.5-rc1' of git://git.infradead.org/linux-ubifs · 6133308a
    Linus Torvalds authored
    Pull UBI and UBIFS updates from Artem Bityutskiy:
    
    UBIFS:
       * Always support xattrs    (remove the Kconfig option)
       * Always support debugging (remove the Kconfig option)
       * A fix for a memory leak on error path
       * A number of clean-ups
    UBI:
       * Always support debugging (remove the Kconfig option)
       * Remove "data type" hint support
       * Huge amount of renames to prepare for the fastmap wor
       * A lot of clean-ups
    
    * tag 'upstream-3.5-rc1' of git://git.infradead.org/linux-ubifs: (54 commits)
      UBI: modify ubi_wl_flush function to clear work queue for a lnum
      UBI: introduce UBI_ALL constant
      UBI: add lnum and vol_id to struct ubi_work
      UBI: add volume id struct ubi_ainf_peb
      UBI: add in hex the value for UBI_INTERNAL_VOL_START to comment
      UBI: rename scan.c to attach.c
      UBI: remove scan.h
      UBI: rename UBI_SCAN_UNKNOWN_EC
      UBI: move and rename attach_by_scanning
      UBI: rename _init_scan functions
      UBI: amend comments after all the renamings
      UBI: rename ubi_scan_leb_slab
      UBI: rename ubi_scan_move_to_list
      UBI: rename ubi_scan_destroy_ai
      UBI: rename ubi_scan_get_free_peb
      UBI: rename ubi_scan_rm_volume
      UBI: rename ubi_scan_find_av
      UBI: rename ubi_scan_add_used
      UBI: remove unused function
      UBI: make ubi_scan_erase_peb static and rename
      ...
    6133308a