summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/lockd.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-03-10 17:06:07 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2016-03-10 17:06:07 +0100
commitf958ee745f70b60d0e41927cab2c073104bc70c2 (patch)
tree24c30a52a5b363e78f1297ede24412c3f55b2dbd /fs/nfsd/lockd.c
parent5a5fbdc0e3f1159a734f1890da60fce70e98271d (diff)
parentc54f0d6ae057444453f5167e66ed999e8cf26936 (diff)
downloadlinux-f958ee745f70b60d0e41927cab2c073104bc70c2.tar.bz2
Merge tag 'kvm-s390-next-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fixes and features for kvm/next (4.6) part 2 - add watchdog diagnose to trace event decoder - better handle the cpu timer when not inside the guest - only provide STFLE if the CPU model has STFLE - reduce DMA page usage
Diffstat (limited to 'fs/nfsd/lockd.c')
0 files changed, 0 insertions, 0 deletions