summaryrefslogtreecommitdiff
path: root/net/unix
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-10 14:23:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-10 14:23:45 -0800
commit7fe654dca20892f37226c31bdd2d5b932f8d843a (patch)
tree0a7d3c1e4eff0a0194fc265efae10ad1cbd2e0c5 /net/unix
parent3ebc7033168d43d12e4941f48a6f257d3f1ea1b5 (diff)
parent0839ffb83e44e5ff1843e932592525fc2bff23ff (diff)
Merge tag 'nfsd-4.10-3' of git://linux-nfs.org/~bfields/linux
Pull nfsd revert from Bruce Fields: "This patch turned out to have a couple problems. The problems are fixable, but at least one of the fixes is a little ugly. The original bug has always been there, so we can wait another week or two to get this right" * tag 'nfsd-4.10-3' of git://linux-nfs.org/~bfields/linux: nfsd: Revert "nfsd: special case truncates some more"
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions
ne with coccinelle and a small amount of manual mopping up" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: ktime: Get rid of ktime_equal() ktime: Cleanup ktime_set() usage ktime: Get rid of the union clocksource: Use a plain u64 instead of cycle_t
Diffstat (limited to 'net/hsr/hsr_framereg.h')