From: Linus Torvalds Date: Wed, 22 Feb 2012 16:43:35 +0000 (-0800) Subject: Merge tag 'nfs-for-3.3-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=437cf4c7b7feeca29f74e1e6f8d458ea2623d5e2;p=linux.git Merge tag 'nfs-for-3.3-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs Bugfixes for the NFS client. Fix a nasty Oops in the NFSv4 getacl code, another source of infinite loops in the NFSv4 state recovery code, and a regression in NFSv4.1 session initialisation. Also deal with an NFSv4.1 memory leak. * tag 'nfs-for-3.3-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: NFSv4: fix server_scope memory leak NFSv4.1: Fix a NFSv4.1 session initialisation regression NFSv4: Ensure we throw out bad delegation stateids on NFS4ERR_BAD_STATEID NFSv4: Fix an Oops in the NFSv4 getacl code --- 437cf4c7b7feeca29f74e1e6f8d458ea2623d5e2