From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 May 2019 22:22:03 +0000 (-0700)
Subject: Merge tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw... 
X-Git-Tag: v5.15~6299
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e2c12200153e63749f836109cef8150f9c61ed8;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'upstream-5.2-rc2' of git://git./linux/kernel/git/rw/ubifs

Pull UBIFS fixes from Richard Weinberger:

 - build errors wrt xattrs

 - mismerge which lead to a wrong Kconfig ifdef

 - missing endianness conversion

* tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubifs: Convert xattr inum to host order
  ubifs: Use correct config name for encryption
  ubifs: Fix build error without CONFIG_UBIFS_FS_XATTR
---

2e2c12200153e63749f836109cef8150f9c61ed8