| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20120220150215.68e88ae1bf96e5790ecd19fd@canb.auug.org.au>
Date: Mon, 20 Feb 2012 15:02:15 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Ohad Ben-Cohen" <ohad@...ery.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Paolo Bonzini <pbonzini@...hat.com>,
James Bottomley <James.Bottomley@...senPartnership.com>,
Rusty Russell <rusty@...tcorp.com.au>
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@...b.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 */
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists