tree 5eeccc14e8d3f8a06d76219d6a61a94349085659
parent 59d8e5eb2bd5593d8220db0e25206cdfc42e83ea
parent 067785c40e52089993757afa28988c05f3cb2694
author Linus Torvalds <torvalds@linux-foundation.org> 1362784928 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1362784928 -0800

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French:
 "A small set of cifs fixes which includes one for a recent regression
  in the write path (pointed out by Anton), some fixes for rename
  problems and as promised for 3.9 removing the obsolete sockopt mount
  option (and the accompanying deprecation warning)."

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix missing of oplock_read value in smb30_values structure
  cifs: don't try to unlock pagecache page after releasing it
  cifs: remove the sockopt= mount option
  cifs: Check server capability before attempting silly rename
  cifs: Fix bug when checking error condition in cifs_rename_pending_delete()