Messages in this thread Patch in this message | | | Date | Fri, 11 Dec 2009 15:40:17 -0800 | From | Greg KH <> | Subject | Re: [GIT PATCH] STAGING patches for 2.6.33-git |
| |
On Fri, Dec 11, 2009 at 03:29:09PM -0800, Linus Torvalds wrote: > > > On Fri, 11 Dec 2009, Greg KH wrote: > > > > Here is the big staging merge for the 2.6.33-git tree > > "B.A.T.M.A.N. Advanced Meshing Protocol"?
I just take the patches, I don't pick the names :)
> Oh, and I think I found a bug in BATMAN already: if you say 'no' to him, > he still asks whether you want to debug him. > > Please, Greg, teach BATMAN that "No means no!".
Doh, I have a patch for that around here from Randy, it didn't make it in... Hm, no, he didn't send the patch, just pointed it out. Here it is below, or you can pull from the same tree and get it:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/
thanks,
greg k-h
From: Greg Kroah-Hartman <gregkh@suse.de> Subject: [PATCH] Staging: batman: fix debug Kconfig option
The debug batman option needs to depend on the correct config option.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/batman-adv/Kconfig b/drivers/staging/batman-adv/Kconfig index b9742e7..7632f57 100644 --- a/drivers/staging/batman-adv/Kconfig +++ b/drivers/staging/batman-adv/Kconfig @@ -15,7 +15,7 @@ config BATMAN_ADV config BATMAN_DEBUG bool "B.A.T.M.A.N. debugging" - depends on BATMAN != n + depends on BATMAN_ADV != n help This is an option for use by developers; most people should
| |