summaryrefslogtreecommitdiff
path: root/include/xen/interface/io/ring.h
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 /include/xen/interface/io/ring.h
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 'include/xen/interface/io/ring.h')
0 files changed, 0 insertions, 0 deletions
ue to the removal of the notifiers. Surely it's out of tree, but it's widely used by distros. The simple solution would have been to reserve a state for LTTNG, but I'm not fond about unused crap in the kernel and the dynamic range, which we admittedly should have done right away, allows us to remove quite some of the hardcoded states, i.e. those which have no ordering requirements. So doing the right thing now is better than having an smaller intermediate solution which needs to be reworked anyway" * 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: cpu/hotplug: Provide dynamic range for prepare stage perf/x86/amd/ibs: Fix typo after cleanup state names in cpu/hotplug
Diffstat (limited to 'include/dt-bindings/clock/r8a7794-clock.h')