* linux-next: manual merge of the remoteproc tree with the scsi tree
@ 2012-02-20 4:02 Stephen Rothwell
2012-02-20 7:57 ` Ohad Ben-Cohen
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-02-20 4:02 UTC (permalink / raw)
To: Ohad Ben-Cohen
Cc: linux-next, linux-kernel, Paolo Bonzini, James Bottomley, Rusty Russell
[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]
Hi Ohad,
Today's linux-next merge of the remoteproc tree got a conflict in
include/linux/virtio_ids.h between commit 4fe74b1cb051 ("[SCSI]
virtio-scsi: SCSI driver for QEMU based virtual machines") from the scsi
tree and commit bcabbccabffe ("rpmsg: add virtio-based remote processor
messaging bus") from the remoteproc tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/virtio_ids.h
index c5d8455,b37c521..0000000
--- a/include/linux/virtio_ids.h
+++ b/include/linux/virtio_ids.h
@@@ -34,7 -34,7 +34,8 @@@
#define VIRTIO_ID_CONSOLE 3 /* virtio console */
#define VIRTIO_ID_RNG 4 /* virtio ring */
#define VIRTIO_ID_BALLOON 5 /* virtio balloon */
+ #define VIRTIO_ID_RPMSG 7 /* virtio remote processor messaging */
+#define VIRTIO_ID_SCSI 8 /* virtio scsi */
#define VIRTIO_ID_9P 9 /* 9p virtio console */
#endif /* _LINUX_VIRTIO_IDS_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the remoteproc tree with the scsi tree
2012-02-20 4:02 linux-next: manual merge of the remoteproc tree with the scsi tree Stephen Rothwell
@ 2012-02-20 7:57 ` Ohad Ben-Cohen
0 siblings, 0 replies; 2+ messages in thread
From: Ohad Ben-Cohen @ 2012-02-20 7:57 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Paolo Bonzini, James Bottomley, Rusty Russell
On Mon, Feb 20, 2012 at 6:02 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks a lot, Stephen.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-20 7:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-20 4:02 linux-next: manual merge of the remoteproc tree with the scsi tree Stephen Rothwell
2012-02-20 7:57 ` Ohad Ben-Cohen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).