linux-kernel - linux-next: manual merge of the vhost tree with the pci 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: <20150413194851.47df3cb5@canb.auug.org.au>
Date:	Mon, 13 Apr 2015 19:48:51 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Michael S. Tsirkin" <mst@...hat.com>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the vhost tree with the pci tree

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in
Documentation/PCI/pci.txt between commit 37a9c502c0af ("PCI: Clarify
policy for vendor IDs in pci.txt") from the pci tree and commit
a708ec6790bb ("pci.txt: clarify vendor ID policy") from the vhost tree.

I fixed it up (I just used the pci tree version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped