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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120313134512.848baf17f46729fa0fac195d@canb.auug.org.au>
Date:	Tue, 13 Mar 2012 13:45:12 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dan Williams <dan.j.williams@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	James Bottomley <James.Bottomley@...senPartnership.com>
Subject: linux-next: manual merge of the isci tree with the scsi tree

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@...b.auug.org.au

Content of type "application/pgp-signature" skipped