From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Nov 2013 17:50:25 +0000 (-0800)
Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: accepted/tizen/common/20141203.182822~1011
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bad8bb5cd3048a67df43ac6b1e2f191f19d9ff0;p=platform%2Fkernel%2Flinux-arm64.git

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

Pull cifs fixes from Steve French:
 "SMB3 "validate negotiate" is needed to prevent certain types of
  downgrade attacks.

  Also changes SMB2/SMB3 copy offload from using the BTRFS copy ioctl
  (BTRFS_IOC_CLONE) to a cifs specific ioctl (CIFS_IOC_COPYCHUNK_FILE)
  to address Christoph's comment that there are semantic differences
  between requesting copy offload in which copy-on-write is mandatory
  (as in the BTRFS ioctl) and optional in the SMB2/SMB3 case.  Also
  fixes SMB2/SMB3 copychunk for large files"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] Do not use btrfs refcopy ioctl for SMB2 copy offload
  Check SMB3 dialects against downgrade attacks
  Removed duplicated (and unneeded) goto
  CIFS: Fix SMB2/SMB3 Copy offload support (refcopy) for large files
---

3bad8bb5cd3048a67df43ac6b1e2f191f19d9ff0