[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110318102232.GA30751@elte.hu>
Date: Fri, 18 Mar 2011 11:22:32 +0100
From: Ingo Molnar <mingo@...e.hu>
To: Greg KH <gregkh@...e.de>
Cc: Jason Baron <jbaron@...hat.com>, rostedt@...dmis.org,
linux-kernel@...r.kernel.org, Bart Van Assche <bvanassche@....org>,
Greg Banks <gnb@...h.org>,
Konrad Rzeszutek Wilk <konrad@...nok.org>,
akpm@...ux-foundation.org,
Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: [PATCH 05/50] Dynamic debug: Add more flags
* Greg KH <gregkh@...e.de> wrote:
> On Thu, Mar 17, 2011 at 01:56:08PM -0400, Jason Baron wrote:
> > On Wed, Mar 16, 2011 at 02:10:43PM -0700, Greg Kroah-Hartman wrote:
> > > Add flags that allow the user to specify via debugfs whether or not the
> > > module name, function name, line number and/or thread ID have to be
> > > included in the printed message.
> >
> > This piece is going to conflict with the jump label update patches, I'm
> > trying to get into .39. The 'if (unlikely(descriptor.enabled))' bit is
> > now: 'if (DDEBUG_BRANCH(descriptor.enabled))'. So its a small conflict,
> > but they wouldn't merge together. So we need to adjust either one (and
> > make sure they're applied in the correct orer), or drop one.
>
> This has been in linux-next for months now, [...]
Btw, a workflow observation, i'd have expected such a commit:
> Signed-off-by: Bart Van Assche <bvanassche@....org>
> Cc: Greg Banks <gnb@...h.org>
> Cc: Konrad Rzeszutek Wilk <konrad@...nok.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
> ---
> Documentation/dynamic-debug-howto.txt | 12 +++++-
> include/linux/dynamic_debug.h | 8 ++++-
> lib/dynamic_debug.c | 60 ++++++++++++++++++++++++++++-----
> 3 files changed, 68 insertions(+), 12 deletions(-)
... to at least have the ack from Jason who is the author and maintainer of the
dyn-printk bits. You should at least have Cc:-ed him!
Preferably it should have been merged through him. That would also have alerted
him to the conflict potential and would have concentrated all changes in a
single tree, as it really should happen ...
So could you *please* do such changes in a bit more organized fashion in the
future? Please use the get_maintainer script:
$ scripts/get_maintainer.pl -f lib/dynamic_debug.c
Jason Baron <jbaron@...hat.com> (commit_signer:6/10=60%)
Thomas Renninger <trenn@...e.de> (commit_signer:3/10=30%)
Pekka Enberg <penberg@...helsinki.fi> (commit_signer:3/10=30%)
Greg Kroah-Hartman <gregkh@...e.de> (commit_signer:3/10=30%)
Steven Rostedt <rostedt@...dmis.org> (commit_signer:2/10=20%)
linux-kernel@...r.kernel.org (open list)
The majority of those gents were not Cc:-ed to any of the submissions and
resubmissions.
To answer your question, the in-flight changes Jason is talking about have not
touched linux-next yet because they went through several levels of review
feedback. Had your patches gone through a similar review process they might
still be in flight as well and we'd also have found out about any conflicts
sooner.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists