projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit25f6a53799d667283d3bee29a6ac75ae3dae38dc
tree9af7509d3ab1ddce7e5a5672cbd7aa3ca5d27c6ftree | snapshot
parenta9d0683e0b62b46c7a5d0ebd8f642d8f9a4b7b32commit | diff
parentf070e5ac9bc7de71c34402048ce5526dccbd347ccommit | 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
fs/jfs/super.c diff1 | diff2 | blob | history
John Crispins staging tree