From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Jun 2019 19:36:54 +0000 (-0700)
Subject: Merge tag 'xfs-5.2-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=01047631df813f6247185547c3778c80af088a20;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'xfs-5.2-fixes-2' of git://git./fs/xfs/xfs-linux

Pull xfs fixes from Darrick Wong:
 "Here are a couple more bug fixes for 5.2. Changes since last update:

   - Fix some forgotten strings in a log debugging function

   - Fix incorrect unit conversion in online fsck code"

* tag 'xfs-5.2-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: inode btree scrubber should calculate im_boffset correctly
  xfs: fix broken log reservation debugging
---

01047631df813f6247185547c3778c80af088a20