From: Borislav Petkov <bp@alien8.de>
To: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@infradead.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
Markus Trippelsdorf <markus@trippelsdorf.de>
Subject: Re: [GIT PULL] perf updates/fixes
Date: Fri, 12 Oct 2012 11:08:11 +0200 [thread overview]
Message-ID: <20121012090810.GA11763@x1.osrc.amd.com> (raw)
In-Reply-To: <20121012083926.GA30327@gmail.com>
On Fri, Oct 12, 2012 at 10:39:26AM +0200, Ingo Molnar wrote:
>
> * Ingo Molnar <mingo@kernel.org> wrote:
>
> > Linus,
> >
> > Please pull the latest perf-urgent-for-linus git tree from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
> >
> > HEAD: 95cf59ea72331d0093010543b8951bb43f262cac perf: Fix perf_cgroup_switch for sw-events
>
> Note that if you merge it then there's a new semantic conflict
> with recent rbtree.c changes in your tree, causing a tools/perf/
> build failure:
>
> ../../lib/rbtree.c:24:36: fatal error: linux/rbtree_augmented.h: No such file or directory compilation terminated.
>
> See the fix below.
>
> ( If the __maybe_unused annotations are too ugly for
> lib/rbtree.c then we'll fix that in tools/perf in a cleaner
> way, weakening the compiler checks for the rbtree build. We
> are using stronger compiler checks in tools/perf/, which has
> served us very well so far and is a big net win - the price is
> the occasional extra annotation of dummy inline function
> parameters. )
Btw,
Markus fixed it that way recently:
http://marc.info/?l=linux-kernel&m=134980573527738
by adding the -Wno-unused-parameter switch only to lib/rbtree.o when
built from within perf.
I see now though that his patch has some unrelated changes to
trace-event-perl.c's permissions which shouldn't be there.
--
Regards/Gruss,
Boris.
next prev parent reply other threads:[~2012-10-12 9:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 8:19 [GIT PULL] perf updates/fixes Ingo Molnar
2012-10-12 8:39 ` Ingo Molnar
2012-10-12 9:08 ` Borislav Petkov [this message]
2012-10-12 9:11 ` Ingo Molnar
2012-10-12 9:23 ` [PATCH] perf: Handle new rbtree implementation Ingo Molnar
2012-10-12 9:18 ` [GIT PULL] perf updates/fixes Markus Trippelsdorf
-- strict thread matches above, loose matches on Subject: below --
2018-11-03 23:03 Ingo Molnar
2018-11-04 1:15 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121012090810.GA11763@x1.osrc.amd.com \
--to=bp@alien8.de \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markus@trippelsdorf.de \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox