[GIT PATCH] STAGING fixes for 2.6.28

[GIT PATCH] STAGING fixes for 2.6.28

[Greg KH]

Here are two small Kconfig staging patches against your 2.6 git tree.

They fix a Kconfig dependancy on the USB/IP drivers that Randy Dunlap
found, and they add a second Kconfig option, which enables the staging
drivers to be automatically excluded from a 'make allmodconfig' or 'make
allyesconfig' build.  This last patch will help out the -next tree a lot
in its automatic build tests.

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/

Patches will be sent as a follow-on to this message to lkml for people
to see.

thanks,

greg k-h


 drivers/staging/Kconfig       |   20 ++++++++++++++++++--
 drivers/staging/usbip/Kconfig |    2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

---------------

Greg Kroah-Hartman (2):
      Staging: only build the tree if we really want to
      Staging: make usbip depend on CONFIG_NET

[PATCH 1/2] Staging: only build the tree if we really want to

[Greg KH]

From: Greg Kroah-Hartman <gregkh@suse.de>

This Kconfig change allows the common 'make allmodconfig' and
'make allyesconfig' build options to skip the staging tree, which is
probably what you want to have happen anyway.

This makes the linux-next developer's life a lot easier so he doesn't
have to worry about changes that break the staging tree, that's for me
to worry about...

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/Kconfig |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index e1654f5..0a49cd7 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -21,7 +21,23 @@ menuconfig STAGING
 
 	  If in doubt, say N here.
 
-if STAGING
+
+config STAGING_EXCLUDE_BUILD
+	bool "Exclude Staging drivers from being built"
+	default y
+	---help---
+	  Are you sure you really want to build the staging drivers?
+	  They taint your kernel, don't live up to the normal Linux
+	  kernel quality standards, are a bit crufty around the edges,
+	  and might go off and kick your dog when you aren't paying
+	  attention.
+
+	  Say N here to be able to select and build the Staging drivers.
+	  This option is primarily here to prevent them from being built
+	  when selecting 'make allyesconfg' and 'make allmodconfig' so
+	  don't be all that put off, your dog will be just fine.
+
+if !STAGING_EXCLUDE_BUILD
 
 source "drivers/staging/et131x/Kconfig"
 
@@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig"
 
 source "drivers/staging/poch/Kconfig"
 
-endif # STAGING
+endif # !STAGING_EXCLUDE_BUILD
-- 
1.5.6

Re: [PATCH 1/2] Staging: only build the tree if we really want to

[Stefan Richter]

Greg KH wrote:
> --- a/drivers/staging/Kconfig
> +++ b/drivers/staging/Kconfig
> @@ -21,7 +21,23 @@ menuconfig STAGING
>  
>  	  If in doubt, say N here.
>  
> -if STAGING
> +
> +config STAGING_EXCLUDE_BUILD
> +	bool "Exclude Staging drivers from being built"
> +	default y
> +	---help---
...
> +if !STAGING_EXCLUDE_BUILD
>  
>  source "drivers/staging/et131x/Kconfig"
>  
> @@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig"
>  
>  source "drivers/staging/poch/Kconfig"
>  
> -endif # STAGING
> +endif # !STAGING_EXCLUDE_BUILD

Which purpose is the STAGING kconfig variable serving after this?  It
controls the visibility of the menu, but switching it off won't switch
off the staging drivers if they were previously enabled, would it?
-- 
Stefan Richter
-=====-==--- =-== -=---
http://arcgraph.de/sr/

Re: [PATCH 1/2] Staging: only build the tree if we really want to

[Greg KH]

On Sat, Nov 08, 2008 at 04:59:37PM +0100, Stefan Richter wrote:
> Greg KH wrote:
> > --- a/drivers/staging/Kconfig
> > +++ b/drivers/staging/Kconfig
> > @@ -21,7 +21,23 @@ menuconfig STAGING
> >  
> >  	  If in doubt, say N here.
> >  
> > -if STAGING
> > +
> > +config STAGING_EXCLUDE_BUILD
> > +	bool "Exclude Staging drivers from being built"
> > +	default y
> > +	---help---
> ...
> > +if !STAGING_EXCLUDE_BUILD
> >  
> >  source "drivers/staging/et131x/Kconfig"
> >  
> > @@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig"
> >  
> >  source "drivers/staging/poch/Kconfig"
> >  
> > -endif # STAGING
> > +endif # !STAGING_EXCLUDE_BUILD
> 
> Which purpose is the STAGING kconfig variable serving after this?

Sitting there and looking pretty :)

> It controls the visibility of the menu, but switching it off won't
> switch off the staging drivers if they were previously enabled, would
> it?

Try it and look in wonder :)

If something affects the visibility of the menu for those config
options, it controls if those options can be enabled or not.

thanks,

greg k-h

Re: [PATCH 1/2] Staging: only build the tree if we really want to

[Stefan Richter]

Greg KH wrote:
> On Sat, Nov 08, 2008 at 04:59:37PM +0100, Stefan Richter wrote:
>>> -endif # STAGING
>>> +endif # !STAGING_EXCLUDE_BUILD
>> Which purpose is the STAGING kconfig variable serving after this?
> 
> Sitting there and looking pretty :)
> 
>> It controls the visibility of the menu, but switching it off won't
>> switch off the staging drivers if they were previously enabled, would
>> it?
> 
> Try it and look in wonder :)
> 
> If something affects the visibility of the menu for those config
> options, it controls if those options can be enabled or not.

Right.  But if you had STAGING on, STAGING_EXCLUDE_BUILD off, and for
example ET131X on, then ET131X will still be on if you switch STAGING
off and save the configuration.
-- 
Stefan Richter
-=====-==--- =-== -=---
http://arcgraph.de/sr/

Re: [PATCH 1/2] Staging: only build the tree if we really want to

[Greg KH]

On Sat, Nov 08, 2008 at 08:31:41PM +0100, Stefan Richter wrote:
> Greg KH wrote:
> > On Sat, Nov 08, 2008 at 04:59:37PM +0100, Stefan Richter wrote:
> >>> -endif # STAGING
> >>> +endif # !STAGING_EXCLUDE_BUILD
> >> Which purpose is the STAGING kconfig variable serving after this?
> > 
> > Sitting there and looking pretty :)
> > 
> >> It controls the visibility of the menu, but switching it off won't
> >> switch off the staging drivers if they were previously enabled, would
> >> it?
> > 
> > Try it and look in wonder :)
> > 
> > If something affects the visibility of the menu for those config
> > options, it controls if those options can be enabled or not.
> 
> Right.  But if you had STAGING on, STAGING_EXCLUDE_BUILD off, and for
> example ET131X on, then ET131X will still be on if you switch STAGING
> off and save the configuration.

I think Linus fixed this, look at 2.6.28-rc4.

thanks,

greg k-h

[PATCH 2/2] Staging: make usbip depend on CONFIG_NET

[Greg KH]

From: Greg Kroah-Hartman <gregkh@suse.de>

Thanks to Randy Dunlap for finding this problem.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/usbip/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig
index 7426235..217fb7e 100644
--- a/drivers/staging/usbip/Kconfig
+++ b/drivers/staging/usbip/Kconfig
@@ -1,6 +1,6 @@
 config USB_IP_COMMON
 	tristate "USB IP support (EXPERIMENTAL)"
-	depends on USB && EXPERIMENTAL
+	depends on USB && NET && EXPERIMENTAL
 	default N
 	---help---
 	  This enables pushing USB packets over IP to allow remote
-- 
1.5.6