From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Dec 2018 22:17:24 +0000 (-0800)
Subject: Merge tag 'upstream-4.20-rc7' of git://git.infradead.org/linux-ubifs
X-Git-Tag: v5.4-rc1~2034
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f57b620a89ad2eee2e25218b5cb2bee0ad1e2e7d;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'upstream-4.20-rc7' of git://git.infradead.org/linux-ubifs

Pull UBI/UBIFS fixes from Richard Weinberger:

 - Kconfig dependency fixes for our new auth feature

 - Fix for selecting the right compressor when creating a fs

 - Bugfix for a bug in UBIFS's O_TMPFILE implementation

 - Refcounting fixes for UBI

* tag 'upstream-4.20-rc7' of git://git.infradead.org/linux-ubifs:
  ubifs: Handle re-linking of inodes correctly while recovery
  ubi: Do not drop UBI device reference before using
  ubi: Put MTD device after it is not used
  ubifs: Fix default compression selection in ubifs
  ubifs: Fix memory leak on error condition
  ubifs: auth: Add CONFIG_KEYS dependency
  ubifs: CONFIG_UBIFS_FS_AUTHENTICATION should depend on UBIFS_FS
  ubifs: replay: Fix high stack usage
---

f57b620a89ad2eee2e25218b5cb2bee0ad1e2e7d