| commit | daf342af2f7856fd2f5c66b9fb39a8f24986ca53 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 04 08:39:03 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 04 08:39:03 2014 -0700 |
| tree | 9cb74ca3ea975e36afb7dbfe6c76b6805485e8b3 | |
| parent | ba1bdefec36c45eef1f8aa44bd845c9ea3190506 [diff] | |
| parent | bb5e50aaa80564268f950d1b2f764455afbfea82 [diff] |
Merge tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy into next Pull jfs changes from Dave Kleikamp. * tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy: fs/jfs/super.c: convert simple_str to kstr fs/jfs/jfs_dmap.c: replace min/casting by min_t fs/jfs/super.c: remove 0 assignment to static + code clean-up fs/jfs/jfs_logmgr.c: remove NULL assignment on static JFS: Check for NULL before calling posix_acl_equiv_mode() fs/jfs/jfs_inode.c: atomically set inode->i_flags