From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Wed, 21 Oct 2015 20:42:20 +0000 (-0500)
Subject: Merge branch 'nfsclone'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=51e0164ebe374a26245312515af4ceae11bed4ae;p=linux-beck.git

Merge branch 'nfsclone'

* nfsclone:
  nfs: add missing linux/types.h
  NFS: Fix an 'unused variable' complaint when #ifndef CONFIG_NFS_V4_2
  nfs42: add NFS_IOC_CLONE_RANGE ioctl
  nfs42: respect clone_blksize
  nfs: get clone_blksize when probing fsinfo
  nfs42: add NFS_IOC_CLONE ioctl
  nfs42: add CLONE proc functions
  nfs42: add CLONE xdr functions
---

51e0164ebe374a26245312515af4ceae11bed4ae