Hi Tejun,
Today's linux-next merge of the workqueues tree got a conflict in
include/linux/libata.h between commit
fa7cd37f808c487f722d7a2ce9c0923a323922df ("libata: use IRQ expecting")
from the lost-spurious-irq tree and commit
ad72cf9885c536e3adae03f8337557ac9dd1e4bb ("libata: take advantage of cmwq
and remove concurrency limitations") from the workqueues tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/libata.h
index 3f5f159,f010f18..0000000
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -751,8 -751,7 +751,9 @@@ struct ata_port
struct ata_host *host;
struct device *dev;
+ struct irq_expect *irq_expect; /* for irq expecting */
+
+ struct mutex scsi_scan_mutex;
struct delayed_work hotplug_task;
struct work_struct scsi_rescan_task;
--
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
