From: Linus Torvalds Date: Thu, 11 Feb 2010 22:06:28 +0000 (-0800) Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 X-Git-Tag: firefly_0821_release~9833^2~3183 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=efa82bab8e3509bb2c4a8044de5909b8bab96cfd;p=firefly-linux-kernel-4.4.55.git Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Fix the mapping of the NFSERR_SERVERFAULT error NFS: Remove a redundant check for PageFsCache in nfs_migrate_page() NFS: Fix a bug in nfs_fscache_release_page() --- efa82bab8e3509bb2c4a8044de5909b8bab96cfd