Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the scsi tree with the rcu tree
@ 2019-10-29  4:08 Stephen Rothwell
  2019-10-29 10:08 ` Paul E. McKenney
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-10-29  4:08 UTC (permalink / raw)
  To: James Bottomley, Paul E. McKenney
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Ryan Attard,
	Martin K. Petersen

[-- Attachment #1: Type: text/plain, Size: 2057 bytes --]

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.

-- 
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)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-29  4:08 linux-next: manual merge of the scsi tree with the rcu tree Stephen Rothwell
2019-10-29 10:08 ` Paul E. McKenney
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

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