summaryrefslogtreecommitdiffstats
path: root/block/bio-integrity.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-07-06 17:07:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-07-06 17:07:56 -0700
commitc7e9ad7da219cf3f8a7cc45eb1c02fdd91199e8d (patch)
tree3c4667adbb13c479ed7f65e0349d4f1f507d0082 /block/bio-integrity.c
parent1c4c7159ed2468f3ac4ce5a7f08d79663d381a93 (diff)
parentebf2d2689de551d90965090bb991fc640a0c0d41 (diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: - fix the perf build, by fixing the rbtree.c sharing bug between kernel and tools/perf by creating a local copy of rbtree.c (more will be done for v4.3) - fix an AUX buffer (Intel-PT support) refcounting bug - fix copy_from_user_nmi() return value" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86: Fix copy_from_user_nmi() return if range is not ok perf: Fix AUX buffer refcounting tools: Copy rbtree_augmented.h from the kernel tools: Move rbtree.h from tools/perf/ tools: Copy lib/rbtree.c to tools/lib/ perf tools: Copy rbtree.h from the kernel tools: Adopt {READ,WRITE_ONCE} from the kernel
Diffstat (limited to 'block/bio-integrity.c')
0 files changed, 0 insertions, 0 deletions