From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Jul 2021 21:25:17 +0000 (-0700)
Subject: Merge tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v5.15~822
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4aa67b023167c570be95a39149a918cca9e36a0;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy

Pull jfs updates from David Kleikamp:
 "JFS fixes for 5.14"

* tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy:
  jfs: Avoid field-overflowing memcpy()
  jfs: remove unnecessary oom message
  jfs: fix GPF in diFree
  fs/jfs: Fix missing error code in lmLogInit()
  jfs: Remove trailing semicolon in macros
  fs: Fix typo issue
---

e4aa67b023167c570be95a39149a918cca9e36a0