Prev: linux-next: build failure after merge of the final tree (hid tree related)
Next: Fix missing of last user info while getting DEBUG_SLAB config enabled
From: Frederic Weisbecker on 1 Apr 2010 02:20 On Wed, Mar 31, 2010 at 05:58:45AM +0200, Frederic Weisbecker wrote: > Ingo, > > Please pull the perf/urgent branch that can be found at: > > git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git > perf/urgent I have updated the tree. There was a leftover patch for perf/core inside (not listed here). Also, since you've merged linus tree in perf/urgent lately, I've zapped my merge commit. Other than that, the three fixes remain. Thanks. > > It fixes the conflict against latest linus's tree that raised > build errors (you can find a merge commit inside). > > I am not yet totally sure about Peter's opinion concerning > the context switch event that is now captured from the kernel. > Our latest discussion on the strict exclude_kernel meaning > seems in favour of this change but I'd prefer to wait for his > final approval before you pull this. > > (I'm not reposting the alignment fix as it is unchanged) > > Thanks, > Frederic > --- > > Frederic Weisbecker (2): > perf: Correctly align perf event tracing buffer > perf: Use hot regs with software sched switch/migrate events > > Jason Wessel (1): > x86,kgdb: Always initialize the hw breakpoint attribute > > > arch/x86/kernel/cpu/perf_event.c | 2 -- > arch/x86/kernel/kgdb.c | 2 +- > include/linux/perf_event.h | 21 ++++++++++++++------- > kernel/perf_event.c | 4 +--- > kernel/trace/trace_event_perf.c | 11 +++++++++-- > 5 files changed, 25 insertions(+), 15 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |