From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Joseph Kogut <joseph.kogut@gmail•com>,
Felipe Balbi <balbi@ti•com>
Subject: linux-next: manual merge of the vhost tree with the usb tree
Date: Thu, 9 Apr 2015 18:07:19 +1000 [thread overview]
Message-ID: <20150409180719.2eee7e59@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2015-04-09 8:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150409180719.2eee7e59@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@ti$(echo .)com \
--cc=joseph.kogut@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox