From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 21 Sep 2018 13:29:44 +0000 (+0200)
Subject: Merge tag 'upstream-4.19-rc4' of git://git.infradead.org/linux-ubifs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0eba8697bce15dc06e2b5c4c66d672c37ca43be0;p=openwrt%2Fstaging%2Fblogic.git

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

Richard writes:
  "This pull request contains fixes for UBIFS:
   - A wrong UBIFS assertion in mount code
   - Fix for a NULL pointer deref in mount code
   - Revert of a bad fix for xattrs"

* tag 'upstream-4.19-rc4' of git://git.infradead.org/linux-ubifs:
  Revert "ubifs: xattr: Don't operate on deleted inodes"
  ubifs: drop false positive assertion
  ubifs: Check for name being NULL while mounting
---

0eba8697bce15dc06e2b5c4c66d672c37ca43be0