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 a9185b41 ("pass writeback_control to ->write_inode")
Showing
fs/logfs/Kconfig
0 → 100644
fs/logfs/Makefile
0 → 100644
fs/logfs/compr.c
0 → 100644
fs/logfs/dev_bdev.c
0 → 100644
fs/logfs/dev_mtd.c
0 → 100644
fs/logfs/dir.c
0 → 100644
fs/logfs/file.c
0 → 100644
fs/logfs/gc.c
0 → 100644
fs/logfs/inode.c
0 → 100644
fs/logfs/journal.c
0 → 100644
fs/logfs/logfs.h
0 → 100644
fs/logfs/logfs_abi.h
0 → 100644
fs/logfs/readwrite.c
0 → 100644
fs/logfs/segment.c
0 → 100644
fs/logfs/super.c
0 → 100644
include/linux/btree-128.h
0 → 100644
include/linux/btree-type.h
0 → 100644
include/linux/btree.h
0 → 100644
lib/btree.c
0 → 100644
Please register or sign in to comment