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

* git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
  [LogFS] Split large truncated into smaller chunks
  [LogFS] Set s_bdi
  [LogFS] Prevent mempool_destroy NULL pointer dereference
  [LogFS] Move assertion
  [LogFS] Plug 8 byte information leak
  [LogFS] Prevent memory corruption on large deletes
  [LogFS] Remove unused method

Fix trivial conflict with added header includes in fs/logfs/super.c

diff --cc fs/logfs/gc.c
Simple merge

diff --cc fs/logfs/journal.c
Simple merge

diff --cc fs/logfs/readwrite.c
Simple merge

diff --cc fs/logfs/segment.c
Simple merge

diff --cc fs/logfs/super.c
index b60bfac3263c71d688532ef5d434e04220d87aa2,dacce3a917aef02c2247cced8a90a28e406af4e5..5866ee6e13278ce873a4771966b5285e0b81db44
--- 1/fs/logfs/super.c
--- 2/fs/logfs/super.c
+++ b/fs/logfs/super.c
@@@ -11,7 -11,7 +11,8 @@@
   */
  #include "logfs.h"
  #include <linux/bio.h>
 +#include <linux/slab.h>
+ #include <linux/blkdev.h>
  #include <linux/mtd/mtd.h>
  #include <linux/statfs.h>
  #include <linux/buffer_head.h>