From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Feb 2021 17:57:30 +0000 (-0800)
Subject: Merge tag 'jfs-5.12' of git://github.com/kleikamp/linux-shaggy
X-Git-Tag: v5.12-rc1~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d88e8b67a6f2f6dae41c986ed58cb1955e0179b3;p=thirdparty%2Flinux.git

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

Pull jfs updates from David Kleikamp:
 "A few jfs fixes"

* tag 'jfs-5.12' of git://github.com/kleikamp/linux-shaggy:
  fs/jfs: fix potential integer overflow on shift of a int
  jfs: turn diLog(), dataLog() and txLog() into void functions
  JFS: more checks for invalid superblock
---

d88e8b67a6f2f6dae41c986ed58cb1955e0179b3