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-Tag: v4.19~283
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db84abf5f8075a739bfd73ddc432e6b8fe3ec4b6;hp=04faac10fcd2d0f7af8183fa02dea26919e29571;p=platform%2Fkernel%2Flinux-rpi.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
---

diff --git a/fs/ubifs/file.h b/fs/ubifs/file.h
deleted file mode 100644
index e69de29..0000000