IDE updates #4

Remove needless/confusing subdirs from drivers/ide/.

Linus, please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/

to receive the following updates:

 drivers/ide/Makefile                    |   84 +++++++++++++++++++++++--------
 drivers/ide/{pci => }/aec62xx.c         |    0 
 drivers/ide/{legacy => }/ali14xx.c      |    0 
 drivers/ide/{pci => }/alim15x3.c        |    0 
 drivers/ide/{pci => }/amd74xx.c         |    0 
 drivers/ide/arm/Makefile                |   10 ----
 drivers/ide/{pci => }/atiixp.c          |    0 
 drivers/ide/{mips => }/au1xxx-ide.c     |    0 
 drivers/ide/{legacy => }/buddha.c       |    0 
 drivers/ide/{pci => }/cmd640.c          |    0 
 drivers/ide/{pci => }/cmd64x.c          |    0 
 drivers/ide/{pci => }/cs5520.c          |    0 
 drivers/ide/{pci => }/cs5530.c          |    0 
 drivers/ide/{pci => }/cs5535.c          |    0 
 drivers/ide/{pci => }/cy82c693.c        |    0 
 drivers/ide/{pci => }/delkin_cb.c       |    0 
 drivers/ide/{legacy => }/dtc2278.c      |    0 
 drivers/ide/{legacy => }/falconide.c    |    0 
 drivers/ide/{legacy => }/gayle.c        |    0 
 drivers/ide/{pci => }/generic.c         |    0 
 drivers/ide/h8300/Makefile              |    2 -
 drivers/ide/{pci => }/hpt366.c          |    0 
 drivers/ide/{legacy => }/ht6560b.c      |    0 
 drivers/ide/{arm => }/icside.c          |    0 
 drivers/ide/{legacy => }/ide-4drives.c  |    0 
 drivers/ide/{legacy => }/ide-cs.c       |    0 
 drivers/ide/{h8300 => }/ide-h8300.c     |    0 
 drivers/ide/{arm => }/ide_arm.c         |    0 
 drivers/ide/{legacy => }/ide_platform.c |    0 
 drivers/ide/{pci => }/it8213.c          |    0 
 drivers/ide/{pci => }/it821x.c          |    0 
 drivers/ide/{pci => }/jmicron.c         |    0 
 drivers/ide/legacy/Makefile             |   25 ---------
 drivers/ide/{legacy => }/macide.c       |    0 
 drivers/ide/mips/Makefile               |    3 -
 drivers/ide/{pci => }/ns87415.c         |    0 
 drivers/ide/{pci => }/opti621.c         |    0 
 drivers/ide/{arm => }/palm_bk3710.c     |    0 
 drivers/ide/pci/Makefile                |   43 ----------------
 drivers/ide/{pci => }/pdc202xx_new.c    |    0 
 drivers/ide/{pci => }/pdc202xx_old.c    |    0 
 drivers/ide/{pci => }/piix.c            |    0 
 drivers/ide/{ppc => }/pmac.c            |    0 
 drivers/ide/ppc/Makefile                |    2 -
 drivers/ide/{legacy => }/q40ide.c       |    0 
 drivers/ide/{legacy => }/qd65xx.c       |    0 
 drivers/ide/{legacy => }/qd65xx.h       |    0 
 drivers/ide/{arm => }/rapide.c          |    0 
 drivers/ide/{pci => }/rz1000.c          |    0 
 drivers/ide/{pci => }/sc1200.c          |    0 
 drivers/ide/{pci => }/scc_pata.c        |    0 
 drivers/ide/{pci => }/serverworks.c     |    0 
 drivers/ide/{pci => }/sgiioc4.c         |    0 
 drivers/ide/{pci => }/siimage.c         |    0 
 drivers/ide/{pci => }/sis5513.c         |    0 
 drivers/ide/{pci => }/sl82c105.c        |    0 
 drivers/ide/{pci => }/slc90e66.c        |    0 
 drivers/ide/{pci => }/tc86c001.c        |    0 
 drivers/ide/{pci => }/triflex.c         |    0 
 drivers/ide/{pci => }/trm290.c          |    0 
 drivers/ide/{legacy => }/umc8672.c      |    0 
 drivers/ide/{pci => }/via82cxxx.c       |    0 
 62 files changed, 63 insertions(+), 106 deletions(-)
 rename drivers/ide/{pci => }/aec62xx.c (100%)
 rename drivers/ide/{legacy => }/ali14xx.c (100%)
 rename drivers/ide/{pci => }/alim15x3.c (100%)
 rename drivers/ide/{pci => }/amd74xx.c (100%)
 delete mode 100644 drivers/ide/arm/Makefile
 rename drivers/ide/{pci => }/atiixp.c (100%)
 rename drivers/ide/{mips => }/au1xxx-ide.c (100%)
 rename drivers/ide/{legacy => }/buddha.c (100%)
 rename drivers/ide/{pci => }/cmd640.c (100%)
 rename drivers/ide/{pci => }/cmd64x.c (100%)
 rename drivers/ide/{pci => }/cs5520.c (100%)
 rename drivers/ide/{pci => }/cs5530.c (100%)
 rename drivers/ide/{pci => }/cs5535.c (100%)
 rename drivers/ide/{pci => }/cy82c693.c (100%)
 rename drivers/ide/{pci => }/delkin_cb.c (100%)
 rename drivers/ide/{legacy => }/dtc2278.c (100%)
 rename drivers/ide/{legacy => }/falconide.c (100%)
 rename drivers/ide/{legacy => }/gayle.c (100%)
 rename drivers/ide/{pci => }/generic.c (100%)
 delete mode 100644 drivers/ide/h8300/Makefile
 rename drivers/ide/{pci => }/hpt366.c (100%)
 rename drivers/ide/{legacy => }/ht6560b.c (100%)
 rename drivers/ide/{arm => }/icside.c (100%)
 rename drivers/ide/{legacy => }/ide-4drives.c (100%)
 rename drivers/ide/{legacy => }/ide-cs.c (100%)
 rename drivers/ide/{h8300 => }/ide-h8300.c (100%)
 rename drivers/ide/{arm => }/ide_arm.c (100%)
 rename drivers/ide/{legacy => }/ide_platform.c (100%)
 rename drivers/ide/{pci => }/it8213.c (100%)
 rename drivers/ide/{pci => }/it821x.c (100%)
 rename drivers/ide/{pci => }/jmicron.c (100%)
 delete mode 100644 drivers/ide/legacy/Makefile
 rename drivers/ide/{legacy => }/macide.c (100%)
 delete mode 100644 drivers/ide/mips/Makefile
 rename drivers/ide/{pci => }/ns87415.c (100%)
 rename drivers/ide/{pci => }/opti621.c (100%)
 rename drivers/ide/{arm => }/palm_bk3710.c (100%)
 delete mode 100644 drivers/ide/pci/Makefile
 rename drivers/ide/{pci => }/pdc202xx_new.c (100%)
 rename drivers/ide/{pci => }/pdc202xx_old.c (100%)
 rename drivers/ide/{pci => }/piix.c (100%)
 rename drivers/ide/{ppc => }/pmac.c (100%)
 delete mode 100644 drivers/ide/ppc/Makefile
 rename drivers/ide/{legacy => }/q40ide.c (100%)
 rename drivers/ide/{legacy => }/qd65xx.c (100%)
 rename drivers/ide/{legacy => }/qd65xx.h (100%)
 rename drivers/ide/{arm => }/rapide.c (100%)
 rename drivers/ide/{pci => }/rz1000.c (100%)
 rename drivers/ide/{pci => }/sc1200.c (100%)
 rename drivers/ide/{pci => }/scc_pata.c (100%)
 rename drivers/ide/{pci => }/serverworks.c (100%)
 rename drivers/ide/{pci => }/sgiioc4.c (100%)
 rename drivers/ide/{pci => }/siimage.c (100%)
 rename drivers/ide/{pci => }/sis5513.c (100%)
 rename drivers/ide/{pci => }/sl82c105.c (100%)
 rename drivers/ide/{pci => }/slc90e66.c (100%)
 rename drivers/ide/{pci => }/tc86c001.c (100%)
 rename drivers/ide/{pci => }/triflex.c (100%)
 rename drivers/ide/{pci => }/trm290.c (100%)
 rename drivers/ide/{legacy => }/umc8672.c (100%)
 rename drivers/ide/{pci => }/via82cxxx.c (100%)

Bartlomiej Zolnierkiewicz (1):
ide: remove useless subdirs from drivers/ide/

index 093d324..9cf92ac 100644
@@ -18,22 +18,66 @@ ide-core-$(CONFIG_BLK_DEV_IDEACPI)	+= ide-acpi.o
 
 obj-$(CONFIG_IDE)			+= ide-core.o
 
-ifeq ($(CONFIG_IDE_ARM), y)
-	ide-arm-core-y += arm/ide_arm.o
-	obj-y += ide-arm-core.o
-endif
-
-obj-$(CONFIG_IDE)			+= legacy/ pci/
+obj-$(CONFIG_IDE_ARM)			+= ide_arm.o
+
+obj-$(CONFIG_BLK_DEV_ALI14XX)		+= ali14xx.o
+obj-$(CONFIG_BLK_DEV_UMC8672)		+= umc8672.o
+obj-$(CONFIG_BLK_DEV_DTC2278)		+= dtc2278.o
+obj-$(CONFIG_BLK_DEV_HT6560B)		+= ht6560b.o
+obj-$(CONFIG_BLK_DEV_QD65XX)		+= qd65xx.o
+obj-$(CONFIG_BLK_DEV_4DRIVES)		+= ide-4drives.o
+
+obj-$(CONFIG_BLK_DEV_GAYLE)		+= gayle.o
+obj-$(CONFIG_BLK_DEV_FALCON_IDE)	+= falconide.o
+obj-$(CONFIG_BLK_DEV_MAC_IDE)		+= macide.o
+obj-$(CONFIG_BLK_DEV_Q40IDE)		+= q40ide.o
+obj-$(CONFIG_BLK_DEV_BUDDHA)		+= buddha.o
+
+obj-$(CONFIG_BLK_DEV_AEC62XX)		+= aec62xx.o
+obj-$(CONFIG_BLK_DEV_ALI15X3)		+= alim15x3.o
+obj-$(CONFIG_BLK_DEV_AMD74XX)		+= amd74xx.o
+obj-$(CONFIG_BLK_DEV_ATIIXP)		+= atiixp.o
+obj-$(CONFIG_BLK_DEV_CELLEB)		+= scc_pata.o
+obj-$(CONFIG_BLK_DEV_CMD64X)		+= cmd64x.o
+obj-$(CONFIG_BLK_DEV_CS5520)		+= cs5520.o
+obj-$(CONFIG_BLK_DEV_CS5530)		+= cs5530.o
+obj-$(CONFIG_BLK_DEV_CS5535)		+= cs5535.o
+obj-$(CONFIG_BLK_DEV_SC1200)		+= sc1200.o
+obj-$(CONFIG_BLK_DEV_CY82C693)		+= cy82c693.o
+obj-$(CONFIG_BLK_DEV_DELKIN)		+= delkin_cb.o
+obj-$(CONFIG_BLK_DEV_HPT366)		+= hpt366.o
+obj-$(CONFIG_BLK_DEV_IT8213)		+= it8213.o
+obj-$(CONFIG_BLK_DEV_IT821X)		+= it821x.o
+obj-$(CONFIG_BLK_DEV_JMICRON)		+= jmicron.o
+obj-$(CONFIG_BLK_DEV_NS87415)		+= ns87415.o
+obj-$(CONFIG_BLK_DEV_OPTI621)		+= opti621.o
+obj-$(CONFIG_BLK_DEV_PDC202XX_OLD)	+= pdc202xx_old.o
+obj-$(CONFIG_BLK_DEV_PDC202XX_NEW)	+= pdc202xx_new.o
+obj-$(CONFIG_BLK_DEV_PIIX)		+= piix.o
+obj-$(CONFIG_BLK_DEV_RZ1000)		+= rz1000.o
+obj-$(CONFIG_BLK_DEV_SVWKS)		+= serverworks.o
+obj-$(CONFIG_BLK_DEV_SGIIOC4)		+= sgiioc4.o
+obj-$(CONFIG_BLK_DEV_SIIMAGE)		+= siimage.o
+obj-$(CONFIG_BLK_DEV_SIS5513)		+= sis5513.o
+obj-$(CONFIG_BLK_DEV_SL82C105)		+= sl82c105.o
+obj-$(CONFIG_BLK_DEV_SLC90E66)		+= slc90e66.o
+obj-$(CONFIG_BLK_DEV_TC86C001)		+= tc86c001.o
+obj-$(CONFIG_BLK_DEV_TRIFLEX)		+= triflex.o
+obj-$(CONFIG_BLK_DEV_TRM290)		+= trm290.o
+obj-$(CONFIG_BLK_DEV_VIA82CXXX)		+= via82cxxx.o
+
+# Must appear at the end of the block
+obj-$(CONFIG_BLK_DEV_GENERIC)		+= ide-pci-generic.o
+ide-pci-generic-y			+= generic.o
 
 obj-$(CONFIG_IDEPCI_PCIBUS_ORDER)	+= ide-scan-pci.o
 
-ifeq ($(CONFIG_BLK_DEV_CMD640), y)
-	cmd640-core-y += pci/cmd640.o
-	obj-y += cmd640-core.o
-endif
+obj-$(CONFIG_BLK_DEV_CMD640)		+= cmd640.o
+
+obj-$(CONFIG_BLK_DEV_IDE_PMAC)		+= pmac.o
+
+obj-$(CONFIG_IDE_H8300)			+= ide-h8300.o
 
-obj-$(CONFIG_IDE)			+= ppc/
-obj-$(CONFIG_IDE_H8300)			+= h8300/
 obj-$(CONFIG_IDE_GENERIC)		+= ide-generic.o
 obj-$(CONFIG_BLK_DEV_IDEPNP)		+= ide-pnp.o
 

@@ -58,14 +102,12 @@ obj-$(CONFIG_IDE_GD)			+= ide-gd_mod.o
 obj-$(CONFIG_BLK_DEV_IDECD)		+= ide-cd_mod.o
 obj-$(CONFIG_BLK_DEV_IDETAPE)		+= ide-tape.o
 
-ifeq ($(CONFIG_BLK_DEV_IDECS), y)
-	ide-cs-core-y += legacy/ide-cs.o
-	obj-y += ide-cs-core.o
-endif
+obj-$(CONFIG_BLK_DEV_IDECS)		+= ide-cs.o
 
-ifeq ($(CONFIG_BLK_DEV_PLATFORM), y)
-	ide-platform-core-y += legacy/ide_platform.o
-	obj-y += ide-platform-core.o
-endif
+obj-$(CONFIG_BLK_DEV_PLATFORM)		+= ide_platform.o
+
+obj-$(CONFIG_BLK_DEV_IDE_ICSIDE)	+= icside.o
+obj-$(CONFIG_BLK_DEV_IDE_RAPIDE)	+= rapide.o
+obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710)	+= palm_bk3710.o
 
-obj-$(CONFIG_IDE)			+= arm/ mips/
+obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)	+= au1xxx-ide.o

similarity index 100%
rename from drivers/ide/pci/aec62xx.c
rename to drivers/ide/aec62xx.c

similarity index 100%
rename from drivers/ide/legacy/ali14xx.c
rename to drivers/ide/ali14xx.c

similarity index 100%
rename from drivers/ide/pci/alim15x3.c
rename to drivers/ide/alim15x3.c

similarity index 100%
rename from drivers/ide/pci/amd74xx.c
rename to drivers/ide/amd74xx.c

deleted file mode 100644
index 5bc2605..0000000
@@ -1,10 +0,0 @@
-
-obj-$(CONFIG_BLK_DEV_IDE_ICSIDE)	+= icside.o
-obj-$(CONFIG_BLK_DEV_IDE_RAPIDE)	+= rapide.o
-obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710)	+= palm_bk3710.o
-
-ifeq ($(CONFIG_IDE_ARM), m)
-	obj-m += ide_arm.o
-endif
-
-EXTRA_CFLAGS	:= -Idrivers/ide

similarity index 100%
rename from drivers/ide/pci/atiixp.c
rename to drivers/ide/atiixp.c

similarity index 100%
rename from drivers/ide/mips/au1xxx-ide.c
rename to drivers/ide/au1xxx-ide.c

similarity index 100%
rename from drivers/ide/legacy/buddha.c
rename to drivers/ide/buddha.c

similarity index 100%
rename from drivers/ide/pci/cmd640.c
rename to drivers/ide/cmd640.c

similarity index 100%
rename from drivers/ide/pci/cmd64x.c
rename to drivers/ide/cmd64x.c

similarity index 100%
rename from drivers/ide/pci/cs5520.c
rename to drivers/ide/cs5520.c

similarity index 100%
rename from drivers/ide/pci/cs5530.c
rename to drivers/ide/cs5530.c

similarity index 100%
rename from drivers/ide/pci/cs5535.c
rename to drivers/ide/cs5535.c

similarity index 100%
rename from drivers/ide/pci/cy82c693.c
rename to drivers/ide/cy82c693.c

similarity index 100%
rename from drivers/ide/pci/delkin_cb.c
rename to drivers/ide/delkin_cb.c

similarity index 100%
rename from drivers/ide/legacy/dtc2278.c
rename to drivers/ide/dtc2278.c

similarity index 100%
rename from drivers/ide/legacy/falconide.c
rename to drivers/ide/falconide.c

similarity index 100%
rename from drivers/ide/legacy/gayle.c
rename to drivers/ide/gayle.c

similarity index 100%
rename from drivers/ide/pci/generic.c
rename to drivers/ide/generic.c

deleted file mode 100644
index 5eba16f..0000000
@@ -1,2 +0,0 @@
-
-obj-$(CONFIG_IDE_H8300)			+= ide-h8300.o

similarity index 100%
rename from drivers/ide/pci/hpt366.c
rename to drivers/ide/hpt366.c

similarity index 100%
rename from drivers/ide/legacy/ht6560b.c
rename to drivers/ide/ht6560b.c

similarity index 100%
rename from drivers/ide/arm/icside.c
rename to drivers/ide/icside.c

similarity index 100%
rename from drivers/ide/legacy/ide-4drives.c
rename to drivers/ide/ide-4drives.c

similarity index 100%
rename from drivers/ide/legacy/ide-cs.c
rename to drivers/ide/ide-cs.c

similarity index 100%
rename from drivers/ide/h8300/ide-h8300.c
rename to drivers/ide/ide-h8300.c

similarity index 100%
rename from drivers/ide/arm/ide_arm.c
rename to drivers/ide/ide_arm.c

similarity index 100%
rename from drivers/ide/legacy/ide_platform.c
rename to drivers/ide/ide_platform.c

similarity index 100%
rename from drivers/ide/pci/it8213.c
rename to drivers/ide/it8213.c

similarity index 100%
rename from drivers/ide/pci/it821x.c
rename to drivers/ide/it821x.c

similarity index 100%
rename from drivers/ide/pci/jmicron.c
rename to drivers/ide/jmicron.c

deleted file mode 100644
index 6939329..0000000
@@ -1,25 +0,0 @@
-
-# link order is important here
-
-obj-$(CONFIG_BLK_DEV_ALI14XX)		+= ali14xx.o
-obj-$(CONFIG_BLK_DEV_UMC8672)		+= umc8672.o
-obj-$(CONFIG_BLK_DEV_DTC2278)		+= dtc2278.o
-obj-$(CONFIG_BLK_DEV_HT6560B)		+= ht6560b.o
-obj-$(CONFIG_BLK_DEV_QD65XX)		+= qd65xx.o
-obj-$(CONFIG_BLK_DEV_4DRIVES)		+= ide-4drives.o
-
-obj-$(CONFIG_BLK_DEV_GAYLE)		+= gayle.o
-obj-$(CONFIG_BLK_DEV_FALCON_IDE)	+= falconide.o
-obj-$(CONFIG_BLK_DEV_MAC_IDE)		+= macide.o
-obj-$(CONFIG_BLK_DEV_Q40IDE)		+= q40ide.o
-obj-$(CONFIG_BLK_DEV_BUDDHA)		+= buddha.o
-
-ifeq ($(CONFIG_BLK_DEV_IDECS), m)
-	obj-m += ide-cs.o
-endif
-
-ifeq ($(CONFIG_BLK_DEV_PLATFORM), m)
-	obj-m += ide_platform.o
-endif
-
-EXTRA_CFLAGS	:= -Idrivers/ide

similarity index 100%
rename from drivers/ide/legacy/macide.c
rename to drivers/ide/macide.c

deleted file mode 100644
index 5873fa0..0000000
@@ -1,3 +0,0 @@
-obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)	+= au1xxx-ide.o
-
-EXTRA_CFLAGS    := -Idrivers/ide

similarity index 100%
rename from drivers/ide/pci/ns87415.c
rename to drivers/ide/ns87415.c

similarity index 100%
rename from drivers/ide/pci/opti621.c
rename to drivers/ide/opti621.c

similarity index 100%
rename from drivers/ide/arm/palm_bk3710.c
rename to drivers/ide/palm_bk3710.c

similarity index 100%
rename from drivers/ide/pci/pdc202xx_new.c
rename to drivers/ide/pdc202xx_new.c

similarity index 100%
rename from drivers/ide/pci/pdc202xx_old.c
rename to drivers/ide/pdc202xx_old.c

similarity index 100%
rename from drivers/ide/pci/piix.c
rename to drivers/ide/piix.c

similarity index 100%
rename from drivers/ide/ppc/pmac.c
rename to drivers/ide/pmac.c

deleted file mode 100644
index 74e52ad..0000000
@@ -1,2 +0,0 @@
-
-obj-$(CONFIG_BLK_DEV_IDE_PMAC)		+= pmac.o

similarity index 100%
rename from drivers/ide/legacy/q40ide.c
rename to drivers/ide/q40ide.c

similarity index 100%
rename from drivers/ide/legacy/qd65xx.c
rename to drivers/ide/qd65xx.c

similarity index 100%
rename from drivers/ide/legacy/qd65xx.h
rename to drivers/ide/qd65xx.h

similarity index 100%
rename from drivers/ide/arm/rapide.c
rename to drivers/ide/rapide.c

similarity index 100%
rename from drivers/ide/pci/rz1000.c
rename to drivers/ide/rz1000.c

similarity index 100%
rename from drivers/ide/pci/sc1200.c
rename to drivers/ide/sc1200.c

similarity index 100%
rename from drivers/ide/pci/scc_pata.c
rename to drivers/ide/scc_pata.c

similarity index 100%
rename from drivers/ide/pci/serverworks.c
rename to drivers/ide/serverworks.c

similarity index 100%
rename from drivers/ide/pci/sgiioc4.c
rename to drivers/ide/sgiioc4.c

similarity index 100%
rename from drivers/ide/pci/siimage.c
rename to drivers/ide/siimage.c

similarity index 100%
rename from drivers/ide/pci/sis5513.c
rename to drivers/ide/sis5513.c

similarity index 100%
rename from drivers/ide/pci/sl82c105.c
rename to drivers/ide/sl82c105.c

similarity index 100%
rename from drivers/ide/pci/slc90e66.c
rename to drivers/ide/slc90e66.c

similarity index 100%
rename from drivers/ide/pci/tc86c001.c
rename to drivers/ide/tc86c001.c

similarity index 100%
rename from drivers/ide/pci/triflex.c
rename to drivers/ide/triflex.c

similarity index 100%
rename from drivers/ide/pci/trm290.c
rename to drivers/ide/trm290.c

similarity index 100%
rename from drivers/ide/legacy/umc8672.c
rename to drivers/ide/umc8672.c

similarity index 100%
rename from drivers/ide/pci/via82cxxx.c
rename to drivers/ide/via82cxxx.c

I dunno, they didn't confuse me...

Not even pci-generic.c?

Argh, as if I had too little to do... now I'll have to modify my
unsubmitted series. :-(

MBR, Sergei

Hello.

I think that with 2 new drivers being submitted/reworked based on
feedback and several patches submitted and pending submission to the pata-2.6 series this really could have waited till 2.6.29...

MBR, Sergei

The situation is perfect right now for this change as there are no outstanding patches in pata-2.6 tree and number of new submitted patches is < 10 (I'll take care of fixing them up, ditto for all other new stuff that will be using old naming scheme).

Thanks,
Bart

Hello.

There was one patch (already stale TX4939 version driver) as of
yesterday.

Thanks for clarifying this.
This rename only added more uncertainty for my pending patchset
(which had been already dependant on at least TX4939 driver which keeps being recast by Atsushi and being stale in pata-2.6 series) as I can't predict when you and Linus will merge the changes and this is getting on my nerves, as I don't have time on any extra rework and I'm running out of time with the submission. I know I should have done this earlier and I'd have done this if its not for my unfortunate vacations... I aslso kept finding new issues looking on the IOC4 driver. :-/

MBR. Sergei

Indeed.

Maybe some parts could be submitted separately? (so keeping them up-to-date in pata-2.6 would be my task)

Also I didn't know anything about your patchset and its dependency on TX4939, otherwise I'll be pushing things in different order or even skip this pull request if needed (TX493x drivers are new stuff and were still under review, such things can be also submitted after the merge window closes so they were given the lowest priority).

Please ping me about such issues, I'm certainly willing to adjust my workflow if this is going to help other people with their work but I can't do much if I don't know anything...

I remember about your SGIIOC4 fixes and they are going to make the next git pull request so sooner this one gets in the better. Also maybe you could get some help with fixing this driver from SGI folks if there are still some issues left?

Thanks,
Bart

Hello.

2 (maybe even 3) out of 4 can be but that doesn't make much sense
already (and would incur the patch reordering for me) -- the best thing you can do is to merge ASAP the last verison of TX4939 which has my ACK. I'm not sure about TX4938 driver yet -- will look at it after some sleep...

The patchset consists of a large patch moving read_sff_dma_status()
to its porper place, one small preparatory patch, and 2 followup patches, so unfortunately it's dependent on TX4939 in its main patch (worse, the relevant part of this driver has changed after your last merged driver version)...

Unfortunately, that driver has been submitted first back 9/09, long
before my patchset was even created, so the dependence was just natural.

I probably should've followed up to your first mail expressing the
intent to remove the subdirs in 2.6.28 but haven't... anyway, it's hard to predict how the things would go (unless you always expect them to go the worst possible way -- that expectation seems to never fail :-).

Though I only was looking at it because of the TX4939 driver being
outdated in pata-2.6 series... otherwise I'd have spent my time on the patchset in question. BTW, the reviews I've been doing have also been time consuming... and that's not speaking of the MUSB issues I've been trying to deal with at the same time at work. :-)

Frankly speaking, I don't see much SGI's interest in this driver (e.
g., I bet they could've implemented DMA tuning having the docs but never done that). I've just fixed what my sight fell at (there are 3 pending cleanup patches but those will have to wait now).

To continue my whining, the bad news of the past day were that I
discovered that my pet Geode board stopped to come up, and that hard drive plugged into HPT371N chip on my other pet Alchemy board didn't get detected by the recent kernel -- and that's not due to my patches (which I was sanity-testing on this board). When I plugged the drive into Promise IDE card (PDC20269), it got detected alright. I don't know what that means yet -- need to try Rocket100 (HPT370) card yet...

MBR, Sergei

Still haven't looked at it... too little sleep and incuring headache. :-/

I could also rip out TX4939 part from the patch and leave Atsushi to deal
with the fallout (though I could give him the ripped out part to simply be merged to the driver) if you would queue my patchset ahead of the driver. Though I feel it's too late now for my patchset to get into 2.6.28 the way things have been happening... :-/

MBR, Sergei

Ehm, submitting things _before_ the merge window usually help. ;-)

Anyway, no need to get too frustrated over it. It is normal that sometimes you will need to push back your own changes if you're doing more higher-level work... though it takes a while to get used to it.

or even ide-pci-generic.c

Fixed in #5.

Hello.

If I only had time to do that...

I got used to my bad luck long ago -- this was only a minor series of
misfortunes... :-)

MBR, Sergei