Re: linux-next: manual merge of the scsi tree with the rcu tree

[Martin K. Petersen]

Stephen,

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

Yes, this was expected. Fix is fine, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering