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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <yq1pnif6ne7.fsf@oracle.com>
Date:   Tue, 29 Oct 2019 21:19:12 -0400
From:   "Martin K. Petersen" <martin.petersen@...cle.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     James Bottomley <James.Bottomley@...senPartnership.com>,
        "Paul E. McKenney" <paulmck@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Ryan Attard <ryanattard@...nattard.info>,
        "Martin K. Petersen" <martin.petersen@...cle.com>
Subject: Re: linux-next: manual merge of the scsi tree with the rcu tree


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