diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-05 14:37:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-05 14:37:25 -0700 |
commit | 7178fb0b239d1c037876301c116fc9a6c1bd2ac0 (patch) | |
tree | 3d42185646c78eb589a6138a9667a25c447e418f /Makefile | |
parent | 70c9fb570b7c1c3edb03cbe745cf81ceeef5d484 (diff) | |
parent | 6f55967ad9d9752813e36de6d5fdbd19741adfc7 (diff) | |
download | linux-7178fb0b239d1c037876301c116fc9a6c1bd2ac0.tar.gz linux-7178fb0b239d1c037876301c116fc9a6c1bd2ac0.tar.bz2 linux-7178fb0b239d1c037876301c116fc9a6c1bd2ac0.zip |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"I'd like to apologize for this very late pull request: I was dithering
through the week whether to send the fixes, and then yesterday Jiri's
crash fix for a regression introduced in this cycle clearly marked
perf/urgent as 'must merge now'.
Most of the commits are tooling fixes, plus there's three kernel fixes
via four commits:
- race fix in the Intel PEBS code
- fix an AUX bug and roll back a previous attempt
- fix AMD family 17h generic HW cache-event perf counters
The largest diffstat contribution comes from the AMD fix - a new event
table is introduced, which is a fairly low risk change but has a large
linecount"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel: Fix race in intel_pmu_disable_event()
perf/x86/intel/pt: Remove software double buffering PMU capability
perf/ring_buffer: Fix AUX software double buffering
perf tools: Remove needless asm/unistd.h include fixing build in some places
tools arch uapi: Copy missing unistd.h headers for arc, hexagon and riscv
tools build: Add -ldl to the disassembler-four-args feature test
perf cs-etm: Always allocate memory for cs_etm_queue::prev_packet
perf cs-etm: Don't check cs_etm_queue::prev_packet validity
perf report: Report OOM in status line in the GTK UI
perf bench numa: Add define for RUSAGE_THREAD if not present
tools lib traceevent: Change tag string for error
perf annotate: Fix build on 32 bit for BPF annotation
tools uapi x86: Sync vmx.h with the kernel
perf bpf: Return value with unlocking in perf_env__find_btf()
MAINTAINERS: Include vendor specific files under arch/*/events/*
perf/x86/amd: Update generic hardware cache events for Family 17h
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions