[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080928020419.GA1257@suse.de>
Date: Sat, 27 Sep 2008 19:04:19 -0700
From: Greg KH <gregkh@...e.de>
To: Martin Schwidefsky <schwidefsky@...ibm.com>
Cc: linux-kernel@...r.kernel.org, linux-s390@...r.kernel.org,
lf_kernel_messages@...ts.linux-foundation.org,
Rusty Russell <rusty@...tcorp.com.au>,
Kay Sievers <kay.sievers@...y.org>,
Joe Perches <joe@...ches.com>, Tim Hockin <thockin@...kin.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Michael Holzheu <holzheu@...ibm.com>,
Gerrit Huizenga <gh@...ibm.com>,
Randy Dunlap <randy.dunlap@...cle.com>,
Jan Kara <jack@...e.cz>, Pavel Machek <pavel@....cz>,
Sam Ravnborg <sam@...nborg.org>,
Jochen Voß <jochen.voss@...glemail.com>,
Kunai Takashi <kunai@...ux-foundation.jp>,
Tim Bird <tim.bird@...sony.com>, Jan Blunck <jblunck@...e.de>,
Rick Troth <rmt@...ita.net>, Utz Bacher <utz.bacher@...ibm.com>
Subject: Re: [patch 2/6] kmsg: tagged device messages.
On Sun, Sep 28, 2008 at 01:11:44AM +0200, Martin Schwidefsky wrote:
> On Fri, 2008-09-26 at 10:57 -0700, Greg KH wrote:
> > Note that you will get some merge errors with -next in device.h due to
> > the dynamic debug printk work that is in my tree and in -next as well.
> > But it should be simple to resolve.
>
> Is the dynamic debug printk work going upstream with the next merge
> window? If yes then I'll wait until it hit Linus tree and update my
> patch.
Yes, it is slated for 2.6.28 inclusion and is in the -next and -mm
releases.
thanks,
greg k-h
--
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