* linux-next: manual merge of the target-updates tree with the scsi-mkp tree
@ 2017-06-13 6:47 Stephen Rothwell
2017-06-30 5:11 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2017-06-13 6:47 UTC (permalink / raw)
To: Nicholas A. Bellinger, Martin K. Petersen
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Quinn Tran
Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in:
drivers/scsi/qla2xxx/qla_target.c
between commit:
f775bd14e44d ("scsi: qla2xxx: Convert 32-bit LUN usage to 64-bit")
from the scsi-mkp tree and commit:
6b26726af699 ("qla2xxx: Convert QLA_TGT_ABTS to TARGET_SCF_LOOKUP_LUN_FROM_TAG")
from the target-updates tree.
I fixed it up (I basically used the latter verion of
__qlt_24xx_handle_abts()) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the target-updates tree with the scsi-mkp tree
2017-06-13 6:47 linux-next: manual merge of the target-updates tree with the scsi-mkp tree Stephen Rothwell
@ 2017-06-30 5:11 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2017-06-30 5:11 UTC (permalink / raw)
To: Nicholas A. Bellinger, James Bottomley
Cc: Martin K. Petersen, Linux-Next Mailing List,
Linux Kernel Mailing List, Quinn Tran
Hi all,
With the merge window approaching, this is just a reminder that the
following conflict still exists. No action is necessarily needed
except to maybe mention this to Linus at the appropriate time.
James, you have been added since you merged the scsi-mkp tree int the
scsi tree.
On Tue, 13 Jun 2017 16:47:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Nicholas,
>
> Today's linux-next merge of the target-updates tree got a conflict in:
>
> drivers/scsi/qla2xxx/qla_target.c
>
> between commit:
>
> f775bd14e44d ("scsi: qla2xxx: Convert 32-bit LUN usage to 64-bit")
>
> from the scsi-mkp tree and commit:
>
> 6b26726af699 ("qla2xxx: Convert QLA_TGT_ABTS to TARGET_SCF_LOOKUP_LUN_FROM_TAG")
>
> from the target-updates tree.
>
> I fixed it up (I basically used the latter verion of
> __qlt_24xx_handle_abts()) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-30 5:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-13 6:47 linux-next: manual merge of the target-updates tree with the scsi-mkp tree Stephen Rothwell
2017-06-30 5:11 ` Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.