linux-kernel - linux-next: manual merge of the vhost tree with the scsi 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>] [day] [month] [year] [list]

Message-ID: <20200804150622.72067466@canb.auug.org.au>
Date:   Tue, 4 Aug 2020 15:06:22 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Michael S. Tsirkin" <mst@...hat.com>,
        James Bottomley <James.Bottomley@...senPartnership.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Xianting Tian <xianting_tian@....com>,
        "Martin K. Petersen" <martin.petersen@...cle.com>
Subject: linux-next: manual merge of the vhost tree with the scsi tree

Hi all,

Today's linux-next merge of the vhost tree got a conflict in:

  drivers/scsi/virtio_scsi.c

between commit:

  92e8d0323a51 ("scsi: virtio_scsi: Remove unnecessary condition check")

from the scsi tree and commit:

  3dfd411ea7ec ("scsi: virtio_scsi: remove unnecessary condition check")

from the vhost tree.

I fixed it up (I used the former as it was a superset of the latter) 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

Content of type "application/pgp-signature" skipped