The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Leon Romanovsky <leon@kernel.org>
To: Mark Brown <broonie@kernel.org>,
	"Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	"Martin K. Petersen" <mkp@kernel.org>,
	Shao Mingyin <shao.mingyin@zte.com.cn>,
	Yong Liu <pkfxxxing@gmail.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the rdma tree
Date: Sun, 22 Nov 2026 10:39:45 +0200	[thread overview]
Message-ID: <20261122083945.GA14811@unreal> (raw)
In-Reply-To: <av8uRPAvMk_hfVSu@sirena.org.uk>

On Thu, Nov 19, 2026 at 05:13:40PM +0000, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   drivers/target/target_core_transport.c
> 
> between commit:
> 
>   1ecb732b4524d ("scsi: target: Clear all control read scatterlist entries")

Martin,

That patch is part of this series:
https://lore.kernel.org/all/20261113083848.1517595-1-pkfxxxing@gmail.com/#t

We can drop it from the RDMA tree and have it go through your tree instead.

Thanks

> 
> from the rdma tree and commit:
> 
>   0fc91e8028018 ("scsi: target: core: Drop the dead kmap_local_page() NULL check")
> 
> from the scsi-mkp 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.
> 
> diff --combined drivers/target/target_core_transport.c
> index 267f5e2cc8b24,9819515ce9674..0000000000000
> --- a/drivers/target/target_core_transport.c
> +++ b/drivers/target/target_core_transport.c
> @@@ -1633,16 -1633,21 +1633,16 @@@ static int __target_submit(struct se_cm
>   	core_alua_check_nonop_delay(cmd);
>   
>   	if (cmd->t_data_nents != 0) {
>  -		/*
>  -		 * This is primarily a hack for udev and tcm loop which sends
>  -		 * INQUIRYs with a single page and expects the data to be
>  -		 * cleared.
>  -		 */
>  +		/* Control CDB handlers may leave response bytes untouched. */
>   		if (!(cmd->se_cmd_flags & SCF_SCSI_DATA_CDB) &&
>   		    cmd->data_direction == DMA_FROM_DEVICE) {
>  -			struct scatterlist *sgl = cmd->t_data_sg;
>  -			unsigned char *buf = NULL;
>  +			struct scatterlist *sg;
>  +			unsigned int i;
>   
>  -			BUG_ON(!sgl);
>  +			BUG_ON(!cmd->t_data_sg);
>   
>  -			buf = kmap_local_page(sg_page(sgl));
>  -			memset(buf + sgl->offset, 0, sgl->length);
>  -			kunmap_local(buf);
>  +			for_each_sg(cmd->t_data_sg, sg, cmd->t_data_nents, i)
>  +				sg_zero_buffer(sg, 1, sg->length, 0);
>   		}
>   	}
>   



      reply	other threads:[~2026-11-22  8:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19 17:13 linux-next: manual merge of the scsi-mkp tree with the rdma tree Mark Brown
2026-11-22  8:39 ` Leon Romanovsky [this message]

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=20261122083945.GA14811@unreal \
    --to=leon@kernel.org \
    --cc=broonie@kernel.org \
    --cc=jgg@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=mkp@kernel.org \
    --cc=pkfxxxing@gmail.com \
    --cc=shao.mingyin@zte.com.cn \
    /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