Messages in this thread | | | Date | Thu, 17 Mar 2011 11:02:04 -0700 | From | Greg KH <> | Subject | Re: [PATCH 05/50] Dynamic debug: Add more flags |
| |
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, where were the jump label patches tested that missed this? Why wasn't your patches in linux-next before the merge window opened? That's a requirement for .39 stuff, right?
Also, this is already in Linus's tree so you will have to handle the merge issue on your side now.
thanks,
greg k-h
| |