From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 Jun 2018 22:52:09 +0000 (-0700)
Subject: Merge tag 'upstream-4.18-rc1' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v5.15~8643
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab0b2e59323cd3972e5f011fbbf3868a4ec360dd;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull UBI and UBIFS updates from Richard Weinberger:

 - the UBI on-disk format header file is now dual licensed

 - new way to detect Fastmap problems during runtime

 - bugfix for Fastmap

 - minor updates for UBIFS (spelling, comments, vm_fault_t, ...)

* tag 'upstream-4.18-rc1' of git://git.infradead.org/linux-ubifs:
  mtd: ubi: Update ubi-media.h to dual license
  ubi: fastmap: Detect EBA mismatches on-the-fly
  ubi: fastmap: Check each mapping only once
  ubi: fastmap: Correctly handle interrupted erasures in EBA
  ubi: fastmap: Cancel work upon detach
  ubifs: lpt: Fix wrong pnode number range in comment
  ubifs: gc: Fix typo
  ubifs: log: Some spelling fixes
  ubifs: Spelling fix someting -> something
  ubifs: journal: Remove wrong comment
  ubifs: remove set but never used variable
  ubifs, xattr: remove misguided quota flags
  fs: ubifs: Adding new return type vm_fault_t
---

ab0b2e59323cd3972e5f011fbbf3868a4ec360dd