From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Jun 2014 15:55:46 +0000 (-0700)
Subject: Merge tag 'upstream-3.16-rc1-v2' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v4.14-rc1~7418
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d53b47c08d8fda1892f47393de8eeab4e34b3188;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'upstream-3.16-rc1-v2' of git://git.infradead.org/linux-ubifs

Pull UBIFS updates from Artem Bityutskiy:
 "This contains several UBIFS fixes.  One of them fixes a race condition
  between the mmap page fault path and fsync.  Another just removes a
  bogus assertion from the UBIFS memory shrinker.

  UBIFS also started honoring the MS_SILENT mount flag, so now it won't
  print many I/O errors when user-space just tries to probe for the FS.

  Rest of the changes are rather minor UBI/UBIFS fixes, improvements,
  and clean-ups"

* tag 'upstream-3.16-rc1-v2' of git://git.infradead.org/linux-ubifs:
  UBIFS: Add an assertion for clean_zn_cnt
  UBIFS: respect MS_SILENT mount flag
  UBIFS: Remove incorrect assertion in shrink_tnc()
  UBIFS: fix debugging check
  UBIFS: add missing ui pointer in debugging code
  UBI: block: Fix error path on alloc_workqueue failure
  UBIFS: Fix dump messages in ubifs_dump_lprops
  UBI: fix rb_tree node comparison in add_map
  UBIFS: Remove unused variables in ubifs_budget_space
  UBI: weaken the 'exclusive' constraint when opening volumes to rename
  UBIFS: fix an mmap and fsync race condition
---

d53b47c08d8fda1892f47393de8eeab4e34b3188