From: Linus Torvalds Date: Fri, 26 Jul 2013 18:21:43 +0000 (-0700) Subject: Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux X-Git-Tag: firefly_0821_release~176^2~5641 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f315cf5e02d9910b7be893f5b5afdcc2e49d352d;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux Pull nfsd fix from Bruce Fields: "One more nfsd bugfix for 3.11" * 'for-3.11' of git://linux-nfs.org/~bfields/linux: nfsd: nfsd_open: when dentry_open returns an error do not propagate as struct file --- f315cf5e02d9910b7be893f5b5afdcc2e49d352d