From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 May 2021 01:08:40 +0000 (-0700)
Subject: Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw... 
X-Git-Tag: v5.15~1194
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51f629446cd172e324deb0146741888cac5dedca;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-5.13-rc1' of git://git./linux/kernel/git/rw/ubifs

Pull JFFS2, UBI and UBIFS updates from Richard Weinberger:
 "JFFS2:
   - Use splice_write()
   - Fix for a slab-out-of-bounds bug

  UBI:
   - Fix for clang related warnings
   - Code cleanup

  UBIFS:
   - Fix for inode rebirth at replay
   - Set s_uuid
   - Use zstd for default filesystem"

* tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
  ubi: Remove unnecessary struct declaration
  jffs2: Hook up splice_write callback
  jffs2: avoid Wempty-body warnings
  jffs2: Fix kasan slab-out-of-bounds problem
  ubi: Fix fall-through warnings for Clang
  ubifs: Report max LEB count at mount time
  ubifs: Set s_uuid in super block to support ima/evm uuid options
  ubifs: Default to zstd compression
  ubifs: Only check replay with inode type to judge if inode linked
---

51f629446cd172e324deb0146741888cac5dedca