* [PATCH] libata: Misc minor merge fixups
@ 2007-03-23 18:54 Alan Cox
2007-04-04 5:47 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Alan Cox @ 2007-03-23 18:54 UTC (permalink / raw)
To: akpm, linux-kernel, jgarzik
Nothing terribly exciting here just odd glitches from the merge
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc4-mm1/drivers/ata/pata_hpt366.c linux-2.6.21-rc4-mm1/drivers/ata/pata_hpt366.c
--- linux.vanilla-2.6.21-rc4-mm1/drivers/ata/pata_hpt366.c 2007-03-23 11:49:49.000000000 +0000
+++ linux-2.6.21-rc4-mm1/drivers/ata/pata_hpt366.c 2007-03-23 13:07:13.000000000 +0000
@@ -169,7 +169,6 @@
/**
* hpt366_filter - mode selection filter
- * @ap: ATA interface
* @adev: ATA device
*
* Block UDMA on devices that cause trouble with this controller.
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc4-mm1/drivers/ata/pata_serverworks.c linux-2.6.21-rc4-mm1/drivers/ata/pata_serverworks.c
--- linux.vanilla-2.6.21-rc4-mm1/drivers/ata/pata_serverworks.c 2007-03-23 11:49:49.000000000 +0000
+++ linux-2.6.21-rc4-mm1/drivers/ata/pata_serverworks.c 2007-03-23 13:22:56.000000000 +0000
@@ -139,7 +139,6 @@
/**
* serverworks_cable_detect - cable detection
* @ap: ATA port
- * @deadline: deadline jiffies for the operation
*
* Perform cable detection according to the device and subvendor
* identifications
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc4-mm1/drivers/ata/pata_sis.c linux-2.6.21-rc4-mm1/drivers/ata/pata_sis.c
--- linux.vanilla-2.6.21-rc4-mm1/drivers/ata/pata_sis.c 2007-03-23 11:49:49.000000000 +0000
+++ linux-2.6.21-rc4-mm1/drivers/ata/pata_sis.c 2007-03-23 13:24:23.000000000 +0000
@@ -88,7 +88,6 @@
/**
* sis_133_cable_detect - check for 40/80 pin
* @ap: Port
- * @deadline: deadline jiffies for the operation
*
* Perform cable detection for the later UDMA133 capable
* SiS chipset.
@@ -109,7 +108,6 @@
/**
* sis_66_cable_detect - check for 40/80 pin
* @ap: Port
- * @deadline: deadline jiffies for the operation
*
* Perform cable detection on the UDMA66, UDMA100 and early UDMA133
* SiS IDE controllers.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] libata: Misc minor merge fixups
2007-03-23 18:54 [PATCH] libata: Misc minor merge fixups Alan Cox
@ 2007-04-04 5:47 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-04-04 5:47 UTC (permalink / raw)
To: Alan Cox; +Cc: akpm, linux-kernel
Alan Cox wrote:
> Nothing terribly exciting here just odd glitches from the merge
ACK, will apply if I can sort out the confusion between -mm and local
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-04-04 5:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-23 18:54 [PATCH] libata: Misc minor merge fixups Alan Cox
2007-04-04 5:47 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox