From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Jun 2016 02:23:38 +0000 (-1000)
Subject: Merge tag 'upstream-4.7-rc4' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v4.14-rc1~3026
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abd38301639f4fa2e63dae75346c1f0d847d0dfa;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'upstream-4.7-rc4' of git://git.infradead.org/linux-ubifs

Pull UBI fixes from Richard Weinberger:
 "This contains fixes for a regression introduced in rc1"

* tag 'upstream-4.7-rc4' of git://git.infradead.org/linux-ubifs:
  ubi: Don't bypass ->getattr()
  Revert "mtd: switch open_mtd_by_chdev() to use of vfs_stat()"
  Revert "mtd: switch ubi_open_volume_path() to vfs_stat()"
---

abd38301639f4fa2e63dae75346c1f0d847d0dfa