forked from luck/tmp_suning_uos_patched
1db772216f
Pull nfsd changes from J Bruce Fields:
"Highlights include:
- Some more DRC cleanup and performance work from Jeff Layton
- A gss-proxy upcall from Simo Sorce: currently krb5 mounts to the
server using credentials from Active Directory often fail due to
limitations of the svcgssd upcall interface. This replacement
lifts those limitations. The existing upcall is still supported
for backwards compatibility.
- More NFSv4.1 support: at this point, if a user with a current
client who upgrades from 4.0 to 4.1 should see no regressions. In
theory we do everything a 4.1 server is required to do. Patches
for a couple minor exceptions are ready for 3.11, and with those
and some more testing I'd like to turn 4.1 on by default in 3.11."
Fix up semantic conflict as per Stephen Rothwell and linux-next:
Commit
|
||
|---|---|---|
| .. | ||
| caching | ||
| configfs | ||
| nfs | ||
| pohmelfs | ||
| 9p.txt | ||
| 00-INDEX | ||
| adfs.txt | ||
| affs.txt | ||
| afs.txt | ||
| autofs4-mount-control.txt | ||
| automount-support.txt | ||
| befs.txt | ||
| bfs.txt | ||
| btrfs.txt | ||
| ceph.txt | ||
| cifs.txt | ||
| coda.txt | ||
| cramfs.txt | ||
| debugfs.txt | ||
| devpts.txt | ||
| directory-locking | ||
| dlmfs.txt | ||
| dnotify_test.c | ||
| dnotify.txt | ||
| ecryptfs.txt | ||
| efivarfs.txt | ||
| exofs.txt | ||
| ext2.txt | ||
| ext3.txt | ||
| ext4.txt | ||
| f2fs.txt | ||
| fiemap.txt | ||
| files.txt | ||
| fuse.txt | ||
| gfs2-glocks.txt | ||
| gfs2-uevents.txt | ||
| gfs2.txt | ||
| hfs.txt | ||
| hfsplus.txt | ||
| hpfs.txt | ||
| inotify.txt | ||
| isofs.txt | ||
| jfs.txt | ||
| Locking | ||
| locks.txt | ||
| logfs.txt | ||
| Makefile | ||
| mandatory-locking.txt | ||
| ncpfs.txt | ||
| nilfs2.txt | ||
| ntfs.txt | ||
| ocfs2.txt | ||
| omfs.txt | ||
| path-lookup.txt | ||
| porting | ||
| proc.txt | ||
| qnx6.txt | ||
| quota.txt | ||
| ramfs-rootfs-initramfs.txt | ||
| relay.txt | ||
| romfs.txt | ||
| seq_file.txt | ||
| sharedsubtree.txt | ||
| spufs.txt | ||
| squashfs.txt | ||
| sysfs-pci.txt | ||
| sysfs-tagging.txt | ||
| sysfs.txt | ||
| sysv-fs.txt | ||
| tmpfs.txt | ||
| ubifs.txt | ||
| udf.txt | ||
| ufs.txt | ||
| vfat.txt | ||
| vfs.txt | ||
| xfs-delayed-logging-design.txt | ||
| xfs-self-describing-metadata.txt | ||
| xfs.txt | ||
| xip.txt | ||