[lkml]   [2015]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-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).

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2015-04-13 12:21    [W:0.030 / U:0.276 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site