Skip to content
  • Linus Torvalds's avatar
    Merge tag 'upstream-4.12-rc1' of git://git.infradead.org/linux-ubifs · b53c4d5e
    Linus Torvalds authored
    Pull UBI/UBIFS updates from Richard Weinberger:
    
     - new config option CONFIG_UBIFS_FS_SECURITY
    
     - minor improvements
    
     - random fixes
    
    * tag 'upstream-4.12-rc1' of git://git.infradead.org/linux-ubifs:
      ubi: Add debugfs file for tracking PEB state
      ubifs: Fix a typo in comment of ioctl2ubifs & ubifs2ioctl
      ubifs: Remove unnecessary assignment
      ubifs: Fix cut and paste error on sb type comparisons
      ubi: fastmap: Fix slab corruption
      ubifs: Add CONFIG_UBIFS_FS_SECURITY to disable/enable security labels
      ubi: Make mtd parameter readable
      ubi: Fix section mismatch
    b53c4d5e