From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi•org>,
"Martin K. Petersen" <martin.petersen@oracle•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Quinn Tran <quinn.tran@cavium•com>
Subject: linux-next: manual merge of the target-updates tree with the scsi-mkp tree
Date: Tue, 13 Jun 2017 16:47:42 +1000 [thread overview]
Message-ID: <20170613164742.7308e4dd@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-06-13 6:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 6:47 Stephen Rothwell [this message]
2017-06-30 5:11 ` linux-next: manual merge of the target-updates tree with the scsi-mkp tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170613164742.7308e4dd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=nab@linux-iscsi$(echo .)org \
--cc=quinn.tran@cavium$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox