• Linus Torvalds's avatar
    Merge tag 'for-linus-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs · b7cef0d2
    Linus Torvalds authored
    Pull UBI and UBIFS updates from Richard Weinberger:
     "UBI:
       - Use bitmap API to allocate bitmaps
       - New attach mode, disable_fm, to attach without fastmap
       - Fixes for various typos in comments
    
      UBIFS:
       - Fix for a deadlock when setting xattrs for encrypted file
       - Fix for an assertion failures when truncating encrypted files
       - Fixes for various typos in comments"
    
    * tag 'for-linus-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
      ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl
      ubi: fastmap: Use the bitmap API to allocate bitmaps
      ubifs: Fix AA deadlock when setting xattr for encrypted file
      ubifs: Fix UBIFS ro fail due to truncate in the encrypted directory
      mtd: ubi: drop unexpected word 'a' in comments
      ubi: block: Fix typos in comments
      ubi: fastmap: Fix typo in comments
      ubi: Fix repeated words in comments
      ubi: ubi-media.h: Fix comment typo
      ubi: block: Remove in vain semicolon
      ubifs: Fix ubifs_check_dir_empty() kernel-doc comment
    b7cef0d2
dir.c 44.1 KB