From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Apr 2017 23:49:16 +0000 (-0700)
Subject: Merge tag 'upstream-4.11-rc7' of git://git.infradead.org/linux-ubifs
X-Git-Tag: android-x86-8.1-r1~3726
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9ea33c44fb19e6cbacf65021628f8ce393ba9f34;p=android-x86%2Fkernel.git

Merge tag 'upstream-4.11-rc7' of git://git.infradead.org/linux-ubifs

Pull UBI/UBIFS fixes from Richard Weinberger:
 "This contains fixes for issues in both UBI and UBIFS:

   - more O_TMPFILE fallout

   - RENAME_WHITEOUT regression due to a mis-merge

   - memory leak in ubifs_mknod()

   - power-cut problem in UBI's update volume feature"

* tag 'upstream-4.11-rc7' of git://git.infradead.org/linux-ubifs:
  ubifs: Fix O_TMPFILE corner case in ubifs_link()
  ubifs: Fix RENAME_WHITEOUT support
  ubifs: Fix debug messages for an invalid filename in ubifs_dump_inode
  ubifs: Fix debug messages for an invalid filename in ubifs_dump_node
  ubifs: Remove filename from debug messages in ubifs_readdir
  ubifs: Fix memory leak in error path in ubifs_mknod
  ubi/upd: Always flush after prepared for an update
---

9ea33c44fb19e6cbacf65021628f8ce393ba9f34