• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs · 66b89159
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
      [LogFS] Change magic number
      [LogFS] Remove h_version field
      [LogFS] Check feature flags
      [LogFS] Only write journal if dirty
      [LogFS] Fix bdev erases
      [LogFS] Silence gcc
      [LogFS] Prevent 64bit divisions in hash_index
      [LogFS] Plug memory leak on error paths
      [LogFS] Add MAINTAINERS entry
      [LogFS] add new flash file system
    
    Fixed up trivial conflict in lib/Kconfig, and a semantic conflict in
    fs/logfs/inode.c introduced by write_inode() being changed to use
    writeback_control' by commit a9185b41
    ("pass writeback_control to ->write_inode")
    66b89159
Makefile 3.42 KB