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

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

Pull JFS fixes from David Kleikamp.

* tag 'jfs-4.13' of git://github.com/kleikamp/linux-shaggy:
  jfs: preserve i_mode if __jfs_set_acl() fails
  jfs: Don't clear SGID when inheriting ACLs
  jfs: atomically read inode size
---

25f6a53799d667283d3bee29a6ac75ae3dae38dc