Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
include/linux/libata.h between commit
9062712fa9ed13b531dfc2228086650b8bd6a255 ("libata: implement
HORKAGE_1_5_GBPS and apply it to WD My Book") from the libata tree tree
and commit 71e75a63456e0bb39afcae3c28dd5e211fb2b637 ("trivial: Fix
misspelling of firmware") from the trivial tree.
Juts trivial context overlap. I fixed it up (see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc include/linux/libata.h
index 5d87bc0,2632f8e..0000000
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -379,8 -379,7 +379,8 @@@ enum
ATA_HORKAGE_BRIDGE_OK = (1 << 10), /* no bridge limits */
ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands
not multiple of 16 bytes */
- ATA_HORKAGE_FIRMWARE_WARN = (1 << 12), /* firwmare update warning */
+ ATA_HORKAGE_FIRMWARE_WARN = (1 << 12), /* firmware update warning */
+ ATA_HORKAGE_1_5_GBPS = (1 << 13), /* force 1.5 Gbps */
/* DMA mask for user DMA control: User visible values; DO NOT
renumber */
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
