From: Linus Torvalds Date: Wed, 18 Aug 2010 22:45:23 +0000 (-0700) Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 X-Git-Tag: Ubuntu-5.2.0-15.16~23766 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=763008c4357b73c8d18396dfd8d79dc58fa3f99d;p=mirror_ubuntu-eoan-kernel.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 an Oops in the NFSv4 atomic open code NFS: Fix the selection of security flavours in Kconfig NFS: fix the return value of nfs_file_fsync() rpcrdma: Fix SQ size calculation when memreg is FRMR xprtrdma: Do not truncate iova_start values in frmr registrations. nfs: Remove redundant NULL check upon kfree() nfs: Add "lookupcache" to displayed mount options NFS: allow close-to-open cache semantics to apply to root of NFS filesystem SUNRPC: fix NFS client over TCP hangs due to packet loss (Bug 16494) --- 763008c4357b73c8d18396dfd8d79dc58fa3f99d