From: Linus Torvalds Date: Mon, 7 Jan 2013 21:21:55 +0000 (-0800) Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=127aa93066261c2b8f03cb38e7165de8cd71736e;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Pull CIFS fixes from Steve French: "Misc small cifs fixes" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: CIFS: Don't let read only caching for mandatory byte-range locked files CIFS: Fix write after setting a read lock for read oplock files Revert "CIFS: Fix write after setting a read lock for read oplock files" cifs: adjust sequence number downward after signing NT_CANCEL request cifs: move check for NULL socket into smb_send_rqst --- 127aa93066261c2b8f03cb38e7165de8cd71736e