linux-next: manual merge of the isci tree with the scsi tree

[Stephen Rothwell]

Hi Dan,

Today's linux-next merge of the isci tree produced a large number of
conflicts against the scsi.

 Merging isci/all
+CONFLICT (content): Merge conflict in include/scsi/sas_ata.h
 CONFLICT (content): Merge conflict in include/scsi/libsas.h
+CONFLICT (content): Merge conflict in include/linux/libata.h
 CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c
+CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_internal.h
 CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c
 CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_expander.c
+CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_event.c
 CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_discover.c
+CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c
+CONFLICT (content): Merge conflict in drivers/scsi/isci/request.h
 CONFLICT (content): Merge conflict in drivers/scsi/isci/registers.h
+CONFLICT (content): Merge conflict in drivers/scsi/isci/port.h
+CONFLICT (content): Merge conflict in drivers/scsi/isci/port.c
+CONFLICT (content): Merge conflict in drivers/scsi/isci/phy.c
 CONFLICT (content): Merge conflict in drivers/scsi/isci/init.c

Since you are feeding patches into the scsi tree (instaed of having you
tree merged into the scsi tree), you should rebase your tree in the scsi
tree after your patches have been accepted.  The above conflicts are
(almost completely) caused by having the same patches in both trees with
additional changes to those files in your tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature