From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vegard Nossum <vegard.nossum@gmail.com>,
Pekka Enberg <penberg@cs.helsinki.fi>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Steven Rostedt <srostedt@redhat.com>
Subject: Re: linux-next: manual merge of the kmemcheck tree with the tracing tree
Date: Mon, 1 Jun 2009 21:46:24 +0200 [thread overview]
Message-ID: <20090601194624.GA29610@elte.hu> (raw)
In-Reply-To: <20090601175539.67317265.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the kmemcheck tree got a conflict in
> kernel/trace/ring_buffer.c between commit
> aa20ae8444fc6c318272c643f856d8d8ad3e198d ("ring-buffer: move big if
> statement down") from the tracing tree and commits
> 9b7ff384ee76ced9638ab236db588a6f13916336 ("trace: annotate bitfields in
> struct ring_buffer_event") and 3467e18b1cf34c7d316af5717e7053ce845d014e
> ("kmemcheck: make bitfield annotations be valid C") from the kmemcheck
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Would be nice if you indicated whether you cross-checked it against
tip:master, which had most of these conflicts resolved already (for
weeks).
( this has relevance for the x86 and tracing tree conflicts -
kmemleak is not in -tip)
Ingo
next prev parent reply other threads:[~2009-06-01 19:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-01 7:55 linux-next: manual merge of the kmemcheck tree with the tracing tree Stephen Rothwell
2009-06-01 14:33 ` Steven Rostedt
2009-06-02 0:32 ` Stephen Rothwell
2009-06-01 19:46 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-06-01 7:55 Stephen Rothwell
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=20090601194624.GA29610@elte.hu \
--to=mingo@elte.hu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=penberg@cs.helsinki.fi \
--cc=sfr@canb.auug.org.au \
--cc=srostedt@redhat.com \
--cc=vegard.nossum@gmail.com \
/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