* linux-next: manual merge of the isci tree with the scsi tree
@ 2012-03-13 2:45 Stephen Rothwell
2012-03-13 2:50 ` Williams, Dan J
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-03-13 2:45 UTC (permalink / raw)
To: Dan Williams; +Cc: linux-next, linux-kernel, James Bottomley
[-- Attachment #1: Type: text/plain, Size: 1644 bytes --]
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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the isci tree with the scsi tree
2012-03-13 2:45 linux-next: manual merge of the isci tree with the scsi tree Stephen Rothwell
@ 2012-03-13 2:50 ` Williams, Dan J
2012-03-13 3:41 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Williams, Dan J @ 2012-03-13 2:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, James Bottomley
On Mon, Mar 12, 2012 at 7:45 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the isci tree with the scsi tree
2012-03-13 2:50 ` Williams, Dan J
@ 2012-03-13 3:41 ` Stephen Rothwell
2012-03-14 7:13 ` Williams, Dan J
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-03-13 3:41 UTC (permalink / raw)
To: Williams, Dan J; +Cc: linux-next, linux-kernel, James Bottomley
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
Hi Dan,
On Mon, 12 Mar 2012 19:50:33 -0700 "Williams, Dan J" <dan.j.williams@intel.com> wrote:
>
> I was wondering why it had not happened prior to this point... in any
It had, I just put up with it the first time :-)
> event I'll get my tree rebased on top scsi-misc so that isci.git#all
> will just be the pending delta.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the isci tree with the scsi tree
2012-03-13 3:41 ` Stephen Rothwell
@ 2012-03-14 7:13 ` Williams, Dan J
2012-03-14 7:38 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Williams, Dan J @ 2012-03-14 7:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, James Bottomley
On Mon, Mar 12, 2012 at 8:41 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dan,
>
> On Mon, 12 Mar 2012 19:50:33 -0700 "Williams, Dan J" <dan.j.williams@intel.com> wrote:
>>
>> I was wondering why it had not happened prior to this point... in any
>
> It had, I just put up with it the first time :-)
Ok, all fixed up now, and I'll be quicker to respin when scsi-misc
picks up the next round of patches.
Thanks for carrying this.
--
Dan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the isci tree with the scsi tree
2012-03-14 7:13 ` Williams, Dan J
@ 2012-03-14 7:38 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2012-03-14 7:38 UTC (permalink / raw)
To: Williams, Dan J; +Cc: linux-next, linux-kernel, James Bottomley
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
hi Dan,
On Wed, 14 Mar 2012 00:13:06 -0700 "Williams, Dan J" <dan.j.williams@intel.com> wrote:
>
> On Mon, Mar 12, 2012 at 8:41 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Dan,
> >
> > On Mon, 12 Mar 2012 19:50:33 -0700 "Williams, Dan J" <dan.j.williams@intel.com> wrote:
> >>
> >> I was wondering why it had not happened prior to this point... in any
> >
> > It had, I just put up with it the first time :-)
>
> Ok, all fixed up now, and I'll be quicker to respin when scsi-misc
> picks up the next round of patches.
Great, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the isci tree with the scsi tree
@ 2012-05-18 2:10 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2012-05-18 2:10 UTC (permalink / raw)
To: Dan Williams; +Cc: linux-next, linux-kernel, James Bottomley
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
Hi Dan,
Today's linux-next merge of the isci tree got a conflict in
drivers/scsi/scsi.c between commit a7a20d103994 ("[SCSI] sd: limit the
scope of the async probe domain") from the scsi tree and commit
2eae65b32c9b ("scsi, sd: limit the scope of the async probe domain") from
the isci tree.
I used the version from the scsi tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-18 2:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-13 2:45 linux-next: manual merge of the isci tree with the scsi tree Stephen Rothwell
2012-03-13 2:50 ` Williams, Dan J
2012-03-13 3:41 ` Stephen Rothwell
2012-03-14 7:13 ` Williams, Dan J
2012-03-14 7:38 ` Stephen Rothwell
2012-05-18 2:10 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).