projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f66c6e6 61edc3f)
Merge tag 'upstream-4.7-rc4' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jun 2016 02:23:38 +0000 (16:23 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jun 2016 02:23:38 +0000 (16:23 -1000)
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()"


Trivial merge
John Crispins staging tree