All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] libata: Restore Kconfig updated experimental levels and correct
@ 2007-03-08 23:24 Alan Cox
  2007-03-09 12:45 ` Jeff Garzik
  2007-03-09 13:03 ` Jeff Garzik
  0 siblings, 2 replies; 4+ messages in thread
From: Alan Cox @ 2007-03-08 23:24 UTC (permalink / raw)
  To: akpm, linux-ide

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc3-mm2/drivers/ata/Kconfig linux-2.6.21-rc3-mm2/drivers/ata/Kconfig
--- linux.vanilla-2.6.21-rc3-mm2/drivers/ata/Kconfig	2007-03-08 16:01:10.000000000 +0000
+++ linux-2.6.21-rc3-mm2/drivers/ata/Kconfig	2007-03-08 16:41:36.000000000 +0000
@@ -184,7 +193,7 @@
 	  If unsure, say N.
 
 config PATA_AMD
-	tristate "AMD/NVidia PATA support (Experimental)"
+	tristate "AMD/NVidia PATA support"
 	depends on PCI
 	help
 	  This option enables support for the AMD and NVidia PATA
@@ -283,7 +292,7 @@
 	  If unsure, say N.
 
 config PATA_HPT366
-	tristate "HPT 366/368 PATA support (Very Experimental)"
+	tristate "HPT 366/368 PATA support (Experimental)"
 	depends on PCI && EXPERIMENTAL
 	help
 	  This option enables support for the HPT 366 and 368
@@ -292,7 +301,7 @@
 	  If unsure, say N.
 
 config PATA_HPT37X
-	tristate "HPT 370/370A/371/372/374/302 PATA support (Very Experimental)"
+	tristate "HPT 370/370A/371/372/374/302 PATA support (Experimental)"
 	depends on PCI && EXPERIMENTAL
 	help
 	  This option enables support for the majority of the later HPT
@@ -319,7 +328,7 @@
 	  If unsure, say N.
 
 config PATA_ISAPNP
-	tristate "ISA Plug and Play PATA support (Very Experimental)"
+	tristate "ISA Plug and Play PATA support (Experimental)"
 	depends on EXPERIMENTAL && ISAPNP
 	help
 	  This option enables support for ISA plug & play ATA
@@ -328,8 +337,8 @@
 	  If unsure, say N.
 
 config PATA_IT821X
-	tristate "IT8211/2 PATA support (Experimental)"
-	depends on PCI && EXPERIMENTAL
+	tristate "IT8211/2 PATA support"
+	depends on PCI
 	help
 	  This option enables support for the ITE 8211 and 8212
 	  PATA controllers via the new ATA layer, including RAID
@@ -400,10 +409,10 @@
 	  If unsure, say N.
 
 config PATA_OLDPIIX
-	tristate "Intel PATA old PIIX support (Experimental)"
-	depends on PCI && EXPERIMENTAL
+	tristate "Intel PATA old PIIX support"
+	depends on PCI
 	help
-	  This option enables support for old(?) PIIX PATA support.
+	  This option enables support for early PIIX PATA support.
 
 	  If unsure, say N.
 
@@ -454,7 +463,7 @@
 	  If unsure, say N.
 
 config PATA_PDC_OLD
-	tristate "Older Promise PATA controller support (Very Experimental)"
+	tristate "Older Promise PATA controller support (Experimental)"
 	depends on PCI && EXPERIMENTAL
 	help
 	  This option enables support for the Promise 20246, 20262, 20263,
@@ -469,7 +478,7 @@
 	  Support for QDI 6500 and 6580 PATA controllers on VESA local bus.
 
 config PATA_RADISYS
-	tristate "RADISYS 82600 PATA support (Very experimental)"
+	tristate "RADISYS 82600 PATA support (Very Experimental)"
 	depends on PCI && EXPERIMENTAL
 	help
 	  This option enables support for the RADISYS 82600
@@ -487,7 +496,7 @@
 	  If unsure, say N.
 
 config PATA_SC1200
-	tristate "SC1200 PATA support (Raving Lunatic)"
+	tristate "SC1200 PATA support (Very Experimental)"
 	depends on PCI && EXPERIMENTAL
 	help
 	  This option enables support for the NatSemi/AMD SC1200 SoC
@@ -496,7 +505,7 @@
 	  If unsure, say N.
 
 config PATA_SERVERWORKS
-	tristate "SERVERWORKS OSB4/CSB5/CSB6/HT1000 PATA support (Experimental)"
+	tristate "SERVERWORKS OSB4/CSB5/CSB6/HT1000 PATA support"
 	depends on PCI
 	help
 	  This option enables support for the Serverworks OSB4/CSB5/CSB6 and
@@ -572,15 +581,6 @@
 
 	  If unsure, say N.
 
-config PATA_SCC
-	tristate "Toshiba's Cell Reference Set IDE support"
-	depends on PCI && PPC_IBM_CELL_BLADE
-	help
-	  This option enables support for the built-in IDE controller on
-	  Toshiba Cell Reference Board.
-
-	  If unsure, say N.
-
 endif
 endmenu
 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] libata: Restore Kconfig updated experimental levels and correct
  2007-03-08 23:24 [PATCH] libata: Restore Kconfig updated experimental levels and correct Alan Cox
@ 2007-03-09 12:45 ` Jeff Garzik
  2007-03-09 14:01   ` Alan Cox
  2007-03-09 13:03 ` Jeff Garzik
  1 sibling, 1 reply; 4+ messages in thread
From: Jeff Garzik @ 2007-03-09 12:45 UTC (permalink / raw)
  To: Alan Cox; +Cc: Andrew Morton, linux-ide

Alan Cox wrote:
> @@ -572,15 +581,6 @@
>  
>  	  If unsure, say N.
>  
> -config PATA_SCC
> -	tristate "Toshiba's Cell Reference Set IDE support"
> -	depends on PCI && PPC_IBM_CELL_BLADE
> -	help
> -	  This option enables support for the built-in IDE controller on
> -	  Toshiba Cell Reference Board.
> -
> -	  If unsure, say N.
> -
>  endif
>  endmenu


I'm going to presume this is a diffing error.

BTW, akpm has a new email address.

	Jeff



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] libata: Restore Kconfig updated experimental levels and correct
  2007-03-08 23:24 [PATCH] libata: Restore Kconfig updated experimental levels and correct Alan Cox
  2007-03-09 12:45 ` Jeff Garzik
@ 2007-03-09 13:03 ` Jeff Garzik
  1 sibling, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2007-03-09 13:03 UTC (permalink / raw)
  To: Alan Cox; +Cc: akpm, linux-ide

Alan Cox wrote:
> Signed-off-by: Alan Cox <alan@redhat.com>

applied, after fixing diff



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] libata: Restore Kconfig updated experimental levels and correct
  2007-03-09 12:45 ` Jeff Garzik
@ 2007-03-09 14:01   ` Alan Cox
  0 siblings, 0 replies; 4+ messages in thread
From: Alan Cox @ 2007-03-09 14:01 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: Andrew Morton, linux-ide

On Fri, 09 Mar 2007 07:45:20 -0500
Jeff Garzik <jeff@garzik.org> wrote:

> Alan Cox wrote:
> > @@ -572,15 +581,6 @@
> >  
> >  	  If unsure, say N.
> >  
> > -config PATA_SCC
> > -	tristate "Toshiba's Cell Reference Set IDE support"
> > -	depends on PCI && PPC_IBM_CELL_BLADE
> > -	help
> > -	  This option enables support for the built-in IDE controller on
> > -	  Toshiba Cell Reference Board.
> > -
> > -	  If unsure, say N.
> > -
> >  endif
> >  endmenu
> 
> 
> I'm going to presume this is a diffing error.

Looks like it, that file took a lot of merging after all the fallout.
Andrew - Jeff is right that this segment shouldnt be applied

Alan

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2007-03-09 13:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-08 23:24 [PATCH] libata: Restore Kconfig updated experimental levels and correct Alan Cox
2007-03-09 12:45 ` Jeff Garzik
2007-03-09 14:01   ` Alan Cox
2007-03-09 13:03 ` Jeff Garzik

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.