]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 May 2013 17:45:59 +0000 (10:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 May 2013 17:45:59 +0000 (10:45 -0700)
commita8432588fc1e406e800e8bf88bebf4cd390b7f46
treed008f1b2ff13541b62c562cdb061ecdd1acd06dd
parent0e255f1c0c9add2f0c920240ac4cadc28ae274c3
parentc2b93e0699723700f886ce17bb65ffd771195a6d
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fix from Steve French:
 "One cifs fix to merge now - fixes possible DFS oops (I expect to
  request a merge of 4 additional cifs fixes next week)"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: only set ops for inodes in I_NEW state