From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Aug 2018 20:27:35 +0000 (-0700)
Subject: Merge tag 'upstream-4.19-rc1-fix' of git://git.infradead.org/linux-ubifs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=db84abf5f8075a739bfd73ddc432e6b8fe3ec4b6;p=openwrt%2Fstaging%2Fblogic.git

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

Pull UBIFS fix from Richard Weinberger:
 "Remove an empty file from UBIFS source"

* tag 'upstream-4.19-rc1-fix' of git://git.infradead.org/linux-ubifs:
  ubifs: Remove empty file.h
---

db84abf5f8075a739bfd73ddc432e6b8fe3ec4b6