[Lucid,1/1] SRU: Re-enable comedi drivers

Hi All,

https://bugs.launchpad.net/ubuntu/+source/linux/+bug/563436

SRU Justification/Impact:

It seems the comedi staging drivers were disabled in Lucid.  This is a
regression from Karmic.  I'm not sure why these were disabled, so if
someone has a good reason for them to remain disabled please speak up.  

Per the request of the usbdux maintainer, I've re-enabled comedi by
reverting the patch which disabled it.  I recognize we are frozen for
the upcoming release so please consider this for the first Lucid Stable
Release Update.

TEST CASE: 

I've built a test kernel which re-enables comedi and have received
confirmation from the bug reporter (usbdux maintainer) that this indeed
provides the comedi drivers.

On Fri, Apr 16, 2010 at 10:17:56AM -0700, Leann Ogasawara wrote:
> Hi All,
> 
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/563436
> 
> SRU Justification/Impact:
> 
> It seems the comedi staging drivers were disabled in Lucid.  This is a
> regression from Karmic.  I'm not sure why these were disabled, so if
> someone has a good reason for them to remain disabled please speak up.  

That was me.  They are in the section where I disabled a slew of stuff
which didn't build at the time.  Seems it got lost in the noise and
never reenabled when it stopped being broken.  I suspect we need
something to track those disablements for next cycle.

> Per the request of the usbdux maintainer, I've re-enabled comedi by
> reverting the patch which disabled it.  I recognize we are frozen for
> the upcoming release so please consider this for the first Lucid Stable
> Release Update.
> 
> TEST CASE: 
> 
> I've built a test kernel which re-enables comedi and have received
> confirmation from the bug reporter (usbdux maintainer) that this indeed
> provides the comedi drivers.
> 
> =====
> 
> The following changes since commit 5ffb75e7dd3b8b15a3957c24895e7c02d876fe0f:
>   Andy Whitcroft (1):
>         UBUNTU: Ubuntu-2.6.32-21.32
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/ogasawara/ubuntu-lucid.git lp563436
> 
> Leann Ogasawara (1):
>       Revert "UBUNTU: staging/comdi -- disable"
> 
>  drivers/staging/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> >From c2cd04d7aea14bd09bf34126cf916566374132e7 Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara@canonical.com>
> Date: Thu, 15 Apr 2010 13:20:11 -0700
> Subject: [PATCH] Revert "UBUNTU: staging/comdi -- disable"
> 
> BugLink: http://bugs.launchpad.net/bugs/563436
> 
> The usbdux author/maintainer has requested that comedi be re-enabled.
> 
> This reverts commit 1db11be784cdb22018c240b40bbe869658b5534c.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>  drivers/staging/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
> index 6f88cb2..3345153 100644
> --- a/drivers/staging/Makefile
> +++ b/drivers/staging/Makefile
> @@ -16,7 +16,7 @@ obj-$(CONFIG_OTUS)		+= otus/
>  obj-$(CONFIG_RT2860)		+= rt2860/
>  obj-$(CONFIG_RT2870)		+= rt2870/
>  obj-$(CONFIG_RT3090)		+= rt3090/
> -#obj-$(CONFIG_COMEDI)		+= comedi/
> +obj-$(CONFIG_COMEDI)		+= comedi/
>  obj-$(CONFIG_ASUS_OLED)		+= asus_oled/
>  obj-$(CONFIG_PANEL)		+= panel/
>  obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw

On Fri, 2010-04-16 at 10:17 -0700, Leann Ogasawara wrote:
> Hi All,
> 
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/563436
> 
> SRU Justification/Impact:
> 
> It seems the comedi staging drivers were disabled in Lucid.  This is a
> regression from Karmic.  I'm not sure why these were disabled, so if
> someone has a good reason for them to remain disabled please speak up.  
> 
> Per the request of the usbdux maintainer, I've re-enabled comedi by
> reverting the patch which disabled it.  I recognize we are frozen for
> the upcoming release so please consider this for the first Lucid Stable
> Release Update.
> 
> TEST CASE: 
> 
> I've built a test kernel which re-enables comedi and have received
> confirmation from the bug reporter (usbdux maintainer) that this indeed
> provides the comedi drivers.
> 
> =====
> 
> The following changes since commit 5ffb75e7dd3b8b15a3957c24895e7c02d876fe0f:
>   Andy Whitcroft (1):
>         UBUNTU: Ubuntu-2.6.32-21.32
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/ogasawara/ubuntu-lucid.git lp563436
> 
> Leann Ogasawara (1):
>       Revert "UBUNTU: staging/comdi -- disable"
> 
>  drivers/staging/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> >From c2cd04d7aea14bd09bf34126cf916566374132e7 Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara@canonical.com>
> Date: Thu, 15 Apr 2010 13:20:11 -0700
> Subject: [PATCH] Revert "UBUNTU: staging/comdi -- disable"
> 
> BugLink: http://bugs.launchpad.net/bugs/563436
> 
> The usbdux author/maintainer has requested that comedi be re-enabled.
> 
> This reverts commit 1db11be784cdb22018c240b40bbe869658b5534c.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>  drivers/staging/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
> index 6f88cb2..3345153 100644
> --- a/drivers/staging/Makefile
> +++ b/drivers/staging/Makefile
> @@ -16,7 +16,7 @@ obj-$(CONFIG_OTUS)		+= otus/
>  obj-$(CONFIG_RT2860)		+= rt2860/
>  obj-$(CONFIG_RT2870)		+= rt2870/
>  obj-$(CONFIG_RT3090)		+= rt3090/
> -#obj-$(CONFIG_COMEDI)		+= comedi/
> +obj-$(CONFIG_COMEDI)		+= comedi/
>  obj-$(CONFIG_ASUS_OLED)		+= asus_oled/
>  obj-$(CONFIG_PANEL)		+= panel/
>  obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/
> -- 
> 1.7.0
> 
> 
Re-enabling cannot be argued against, so yep, should be enabled.


Acked-by: Colin King <colin.king@canonical.com>

On Fri, 2010-04-16 at 19:10 +0100, Andy Whitcroft wrote:
> On Fri, Apr 16, 2010 at 10:17:56AM -0700, Leann Ogasawara wrote:
> > Hi All,
> > 
> > https://bugs.launchpad.net/ubuntu/+source/linux/+bug/563436
> > 
> > SRU Justification/Impact:
> > 
> > It seems the comedi staging drivers were disabled in Lucid.  This is a
> > regression from Karmic.  I'm not sure why these were disabled, so if
> > someone has a good reason for them to remain disabled please speak up.  
> 
> That was me.  They are in the section where I disabled a slew of stuff
> which didn't build at the time.  Seems it got lost in the noise and
> never reenabled when it stopped being broken.  I suspect we need
> something to track those disablements for next cycle.

Andy, should this go into a blueprint for UDS or be logged somewhere as
a TO-DO item so we won't forget to do this?

> 
> > Per the request of the usbdux maintainer, I've re-enabled comedi by
> > reverting the patch which disabled it.  I recognize we are frozen for
> > the upcoming release so please consider this for the first Lucid Stable
> > Release Update.
> > 
> > TEST CASE: 
> > 
> > I've built a test kernel which re-enables comedi and have received
> > confirmation from the bug reporter (usbdux maintainer) that this indeed
> > provides the comedi drivers.
> > 
> > =====
> > 
> > The following changes since commit 5ffb75e7dd3b8b15a3957c24895e7c02d876fe0f:
> >   Andy Whitcroft (1):
> >         UBUNTU: Ubuntu-2.6.32-21.32
> > 
> > are available in the git repository at:
> > 
> >   git://kernel.ubuntu.com/ogasawara/ubuntu-lucid.git lp563436
> > 
> > Leann Ogasawara (1):
> >       Revert "UBUNTU: staging/comdi -- disable"
> > 
> >  drivers/staging/Makefile |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > >From c2cd04d7aea14bd09bf34126cf916566374132e7 Mon Sep 17 00:00:00 2001
> > From: Leann Ogasawara <leann.ogasawara@canonical.com>
> > Date: Thu, 15 Apr 2010 13:20:11 -0700
> > Subject: [PATCH] Revert "UBUNTU: staging/comdi -- disable"
> > 
> > BugLink: http://bugs.launchpad.net/bugs/563436
> > 
> > The usbdux author/maintainer has requested that comedi be re-enabled.
> > 
> > This reverts commit 1db11be784cdb22018c240b40bbe869658b5534c.
> > 
> > Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> > ---
> >  drivers/staging/Makefile |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
> > index 6f88cb2..3345153 100644
> > --- a/drivers/staging/Makefile
> > +++ b/drivers/staging/Makefile
> > @@ -16,7 +16,7 @@ obj-$(CONFIG_OTUS)		+= otus/
> >  obj-$(CONFIG_RT2860)		+= rt2860/
> >  obj-$(CONFIG_RT2870)		+= rt2870/
> >  obj-$(CONFIG_RT3090)		+= rt3090/
> > -#obj-$(CONFIG_COMEDI)		+= comedi/
> > +obj-$(CONFIG_COMEDI)		+= comedi/
> >  obj-$(CONFIG_ASUS_OLED)		+= asus_oled/
> >  obj-$(CONFIG_PANEL)		+= panel/
> >  obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/
> 
> Acked-by: Andy Whitcroft <apw@canonical.com>
> 
> -apw
>

Applied to Lucid.

-apw