projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ab59d1f ae9ebe7)
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Nov 2016 19:33:28 +0000 (11:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Nov 2016 19:33:28 +0000 (11:33 -0800)
commit22d3d4fbbd5892af78285bc263fbc3d3e111d5b8
tree9a084cc9a7d1c39c6e3422cae41d665fd40134f8tree | snapshot
parentab59d1f4b66540d2b9c4a15b377d6c9e6ffd1103commit | diff
parentae9ebe7c4ee0c16c3d55d1ae3096c82e0a7c136fcommit | diff
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French:
 "A few misc important cifs fixes, including a fix for a 4.9 regression
  in posix_acl xattr handling"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: iterate over posix acl xattr entry correctly in ACL_to_cifs_posix()
  Call echo service immediately after socket reconnect
  CIFS: Fix BUG() in calc_seckey()
John Crispins staging tree