From: Roman Bolshakov <r.bolshakov@yadro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mike Christie <michael.christie@oracle.com>
Subject: Re: linux-next: manual merge of the scsi tree with the scsi-fixes tree
Date: Wed, 7 Apr 2021 13:47:38 +0300 [thread overview]
Message-ID: <YG2Nype3/WTD/S0q@SPB-NB-133.local> (raw)
In-Reply-To: <20210407170457.77b88f83@canb.auug.org.au>
On Wed, Apr 07, 2021 at 05:04:57PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the scsi tree got a conflict in:
>
> drivers/target/iscsi/iscsi_target.c
>
> between commit:
>
> 0352c3d3959a ("scsi: target: iscsi: Fix zero tag inside a trace event")
>
> from the scsi-fixes tree and commit:
>
> 08694199477d ("scsi: target: core: Add gfp_t arg to target_cmd_init_cdb()")
>
> from the scsi tree.
>
> I fixed it up (see below) 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.
>
Hi Stephen,
I'm sorry for not mentioning the issue. IIRC I sent 0352c3d3959a off
linus/master, because 5.12/scsi-fixes was quite behind it. I have to say
that for this particular fix I didn't try to apply it to 5.13/scsi-queue
because I didn't expect any conflicts for such a small change :)
I will apply to both <next>/scsi-queue and <current>/scsi-fixes next
time before submission even for trivial patches to avoid the confusion.
The conflict resolution is fine.
Thanks,
Roman
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/target/iscsi/iscsi_target.c
> index e5c443bfbdf9,cf7f0465dd63..000000000000
> --- a/drivers/target/iscsi/iscsi_target.c
> +++ b/drivers/target/iscsi/iscsi_target.c
> @@@ -1166,8 -1166,8 +1166,9 @@@ int iscsit_setup_scsi_cmd(struct iscsi_
>
> target_get_sess_cmd(&cmd->se_cmd, true);
>
> + cmd->se_cmd.tag = (__force u32)cmd->init_task_tag;
> - cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb);
> + cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb,
> + GFP_KERNEL);
> if (cmd->sense_reason) {
> if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {
> return iscsit_add_reject_cmd(cmd,
next prev parent reply other threads:[~2021-04-07 10:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 7:04 linux-next: manual merge of the scsi tree with the scsi-fixes tree Stephen Rothwell
2021-04-07 10:47 ` Roman Bolshakov [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-16 6:40 Stephen Rothwell
2019-01-14 2:52 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=YG2Nype3/WTD/S0q@SPB-NB-133.local \
--to=r.bolshakov@yadro.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=michael.christie@oracle.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).