From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Apr 2018 23:39:34 +0000 (-0700)
Subject: Merge tag 'tags/upstream-4.17-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v4.17-rc1~48
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=77cb51e65df0010cb22169bcbb6ea1b4f21da7e0;p=users%2Fhch%2Fmisc.git

Merge tag 'tags/upstream-4.17-rc1' of git://git.infradead.org/linux-ubifs

Pull UBI and UBIFS updates from Richard Weinberger:
 "Minor bug fixes and improvements"

* tag 'tags/upstream-4.17-rc1' of git://git.infradead.org/linux-ubifs:
  ubi: Reject MLC NAND
  ubifs: Remove useless parameter of lpt_heap_replace
  ubifs: Constify struct ubifs_lprops in scan_for_leb_for_idx
  ubifs: remove unnecessary assignment
  ubi: Fix error for write access
  ubi: fastmap: Don't flush fastmap work on detach
  ubifs: Check ubifs_wbuf_sync() return code
---

77cb51e65df0010cb22169bcbb6ea1b4f21da7e0