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-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html