From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jason Wessel <jason.wessel@windriver.com>,
Lai Jiangshan <laijs@cn.fujitsu.com>,
Steven Rostedt <rostedt@goodmis.org>,
Fr??d??ric Weisbecker <fweisbec@gmail.com>
Subject: Re: linux-next: manual merge of the tip tree with the kgdb tree
Date: Thu, 14 Jan 2010 10:26:00 +0100 [thread overview]
Message-ID: <20100114092600.GA13503@elte.hu> (raw)
In-Reply-To: <20100114161302.285ebe27.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> kernel/trace/trace.c between commit
> d304af88a0105ff5b64cffc9108636ecad1fdd78 ("ftrace,kdb: Extend kdb to be
> able to dump the ftrace buffer") from the kgdb tree and commit
> 7e53bd42d14c75192b99674c40fcc359392da59d ("tracing: Consolidate
> protection of reader access to the ring buffer") from the tip tree.
Hm, Jason, what is that large commit to kernel/trace/ doing in the KGDB tree,
without any apparent acks from the affected people?
I dont see it anywhere on lkml nor in my mbox. Please submit it to the
affected maintainers - for the Cc: line see the output of:
scripts/get_maintainer.pl -f kernel/trace/trace.c
Thanks,
Ingo
next prev parent reply other threads:[~2010-01-14 9:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-14 5:13 linux-next: manual merge of the tip tree with the kgdb tree Stephen Rothwell
2010-01-14 9:26 ` Ingo Molnar [this message]
2010-01-14 15:01 ` Jason Wessel
2010-01-14 15:20 ` Steven Rostedt
2010-01-14 15:49 ` Jason Wessel
-- strict thread matches above, loose matches on Subject: below --
2010-05-14 4:14 Stephen Rothwell
2010-05-14 14:00 ` Don Zickus
2010-02-01 6:29 Stephen Rothwell
2010-02-01 15:46 ` Jason Wessel
2010-02-01 23:25 ` Stephen Rothwell
2009-10-28 7:04 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=20100114092600.GA13503@elte.hu \
--to=mingo@elte.hu \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jason.wessel@windriver.com \
--cc=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).