tree b092b859ca01d7544a666c95f940144b0ef3b35b
parent 87c7ae06cc50bcbcdcc60d64a959ca0b9b71f892
parent c2f843f03d658e9ab2a1a455f2c1851fd6a869af
author Linus Torvalds <torvalds@linux-foundation.org> 1267910283 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1267910283 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

* 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 a9185b41a4f84971b930c519f0c63bd450c4810d
("pass writeback_control to ->write_inode")