* linux-next: manual merge of the vhost tree with the usb tree
@ 2015-04-09 8:07 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-04-09 8:07 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: linux-next, linux-kernel, Joseph Kogut, Felipe Balbi
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
drivers/usb/dwc3/dwc3-pci.c between commit adf9c3c85615 ("usb: move
definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h") from the usb
tree and commit 3d4e078e29d3 ("usb/dwc3: comment update") from the
vhost tree.
I fixed it up (they both removed the same line - the former removed
another line as well) and can carry the fix as necessary (no action is
required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-09 8:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-09 8:07 linux-next: manual merge of the vhost tree with the usb tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox