Messages in this thread | | | Date | Mon, 20 Feb 2012 15:02:15 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the remoteproc tree with the scsi tree |
| |
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 */ [unhandled content-type:application/pgp-signature] | |