| commit | 25f6a53799d667283d3bee29a6ac75ae3dae38dc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 25 08:51:57 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 25 08:51:57 2017 -0700 |
| tree | 9af7509d3ab1ddce7e5a5672cbd7aa3ca5d27c6f | |
| parent | a9d0683e0b62b46c7a5d0ebd8f642d8f9a4b7b32 [diff] | |
| parent | f070e5ac9bc7de71c34402048ce5526dccbd347c [diff] |
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