On Mon, Mar 12, 2012 at 7:45 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > 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. I was wondering why it had not happened prior to this point... in any event I'll get my tree rebased on top scsi-misc so that isci.git#all will just be the pending delta. -- 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
