From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Jul 2017 17:41:12 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: Ubuntu-5.2.0-15.16~6375
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=791f2df39b8248490ab41022939debaa82b96028;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull misc filesystem fixes from Jan Kara:
 "Several ACL related fixes for ext2, reiserfs, and hfsplus.

  And also one minor isofs cleanup"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  hfsplus: Don't clear SGID when inheriting ACLs
  isofs: Fix off-by-one in 'session' mount option parsing
  reiserfs: preserve i_mode if __reiserfs_set_acl() fails
  ext2: preserve i_mode if ext2_set_acl() fails
  ext2: Don't clear SGID when inheriting ACLs
  reiserfs: Don't clear SGID when inheriting ACLs
---

791f2df39b8248490ab41022939debaa82b96028