From: Linus Torvalds Date: Mon, 11 May 2015 21:42:52 +0000 (-0700) Subject: Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux X-Git-Tag: v5.15~15791 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4cfceaf0c087f47033f5e61a801f4136d6fb68c6;p=mirror_ubuntu-kernels.git Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux Pull nfsd bugfixes from Bruce Fields: "Mainly pnfs fixes (and for problems with generic callback code made more obvious by pnfs)" * 'for-4.1' of git://linux-nfs.org/~bfields/linux: nfsd: skip CB_NULL probes for 4.1 or later nfsd: fix callback restarts nfsd: split transport vs operation errors for callbacks svcrpc: fix potential GSSX_ACCEPT_SEC_CONTEXT decoding failures nfsd: fix pNFS return on close semantics nfsd: fix the check for confirmed openowner in nfs4_preprocess_stateid_op nfsd/blocklayout: pretend we can send deviceid notifications --- 4cfceaf0c087f47033f5e61a801f4136d6fb68c6