diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-20 10:41:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-20 10:41:12 -0700 |
| commit | 791f2df39b8248490ab41022939debaa82b96028 (patch) | |
| tree | 99fd6e5536433d7758f087635e67e78a33749ae4 /fs/nls | |
| parent | 465b0dbb38a02c449c62563ce0995e741c0ebe18 (diff) | |
| parent | 84969465ddc4f8aeb3b993123b571aa01c5f2683 (diff) | |
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
Diffstat (limited to 'fs/nls')
0 files changed, 0 insertions, 0 deletions