Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: "Paul E. McKenney" <paulmck@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Ryan Attard <ryanattard@ryanattard.info>,
	"Martin K. Petersen" <martin.petersen@oracle.com>
Subject: Re: linux-next: manual merge of the scsi tree with the rcu tree
Date: Tue, 29 Oct 2019 03:08:44 -0700
Message-ID: <20191029100844.GJ20975@paulmck-ThinkPad-P72> (raw)
In-Reply-To: <20191029150826.38c26ef8@canb.auug.org.au>

On Tue, Oct 29, 2019 at 03:08:26PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the scsi tree got a conflict in:
> 
>   drivers/scsi/scsi_sysfs.c
> 
> between commit:
> 
>   81db81f82993 ("drivers/scsi: Replace rcu_swap_protected() with rcu_replace()")
> 
> from the rcu tree and commit:
> 
>   d188b0675b21 ("scsi: core: Add sysfs attributes for VPD pages 0h and 89h")
> 
> 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.

Looks good to me, thank you very much!

							Thanx, Paul

> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/scsi/scsi_sysfs.c
> index cc51f4756077,0fa2ed343c7f..000000000000
> --- a/drivers/scsi/scsi_sysfs.c
> +++ b/drivers/scsi/scsi_sysfs.c
> @@@ -466,12 -467,18 +467,18 @@@ static void scsi_device_dev_release_use
>   	sdev->request_queue = NULL;
>   
>   	mutex_lock(&sdev->inquiry_mutex);
>  -	rcu_swap_protected(sdev->vpd_pg0, vpd_pg0,
>  -			   lockdep_is_held(&sdev->inquiry_mutex));
>  -	rcu_swap_protected(sdev->vpd_pg80, vpd_pg80,
>  -			   lockdep_is_held(&sdev->inquiry_mutex));
>  -	rcu_swap_protected(sdev->vpd_pg83, vpd_pg83,
>  -			   lockdep_is_held(&sdev->inquiry_mutex));
>  -	rcu_swap_protected(sdev->vpd_pg89, vpd_pg89,
>  -			   lockdep_is_held(&sdev->inquiry_mutex));
> ++	vpd_pg0 = rcu_replace_pointer(sdev->vpd_pg0, vpd_pg0,
> ++				      lockdep_is_held(&sdev->inquiry_mutex));
>  +	vpd_pg80 = rcu_replace_pointer(sdev->vpd_pg80, vpd_pg80,
>  +				       lockdep_is_held(&sdev->inquiry_mutex));
>  +	vpd_pg83 = rcu_replace_pointer(sdev->vpd_pg83, vpd_pg83,
>  +				       lockdep_is_held(&sdev->inquiry_mutex));
> ++	vpd_pg89 = rcu_replace_pointer(sdev->vpd_pg89, vpd_pg89,
> ++				       lockdep_is_held(&sdev->inquiry_mutex));
>   	mutex_unlock(&sdev->inquiry_mutex);
>   
> + 	if (vpd_pg0)
> + 		kfree_rcu(vpd_pg0, rcu);
>   	if (vpd_pg83)
>   		kfree_rcu(vpd_pg83, rcu);
>   	if (vpd_pg80)



  reply index

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-29  4:08 Stephen Rothwell
2019-10-29 10:08 ` Paul E. McKenney [this message]
2019-10-30  1:19 ` Martin K. Petersen
     [not found] ` <CAEXS_ixkUAPTz4=ta+=+YLrsnmrAcuG43bLNX11Dzffi4L-Upg@mail.gmail.com>
2019-11-02 13:45   ` Paul E. McKenney

Reply instructions:

You may reply publically 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=20191029100844.GJ20975@paulmck-ThinkPad-P72 \
    --to=paulmck@kernel.org \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=ryanattard@ryanattard.info \
    --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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git