]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9d0683 f070e5a)
Merge tag 'jfs-4.13' of git://github.com/kleikamp/linux-shaggy
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jul 2017 15:51:57 +0000 (08:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jul 2017 15:51:57 +0000 (08:51 -0700)
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

1  2 
fs/jfs/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/jfs/super.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.