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
--- a/fs/ubifs/file.h
+++ /dev/null