From 2eaff1f35c8dfdc25e9c7c15dfe0ed3b3793d767 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 30 Jul 2012 13:30:52 +0930
Subject: [PATCH] --- yaml --- r: 319823 b: refs/heads/master c:
 6a743897144500fb4c4566ced3a498d5180fbb5b h: refs/heads/master i:   319821:
 7640560ba823add9ecedde12b3d787b845c5ff30   319819:
 5ff799af305c49517c2f07f3feceec7012f048f2   319815:
 dfd4ec78bb7311dffc68c2475f71240f7835bac7   319807:
 27655db887eedf7351e5166a93fbadf41ac50e7a v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/virtio_blk.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 899f941ab4a6..c46c370b7bc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd5d503862b0d0d927c56ef2e34d3ededac88039
+refs/heads/master: 6a743897144500fb4c4566ced3a498d5180fbb5b
diff --git a/trunk/include/linux/virtio_blk.h b/trunk/include/linux/virtio_blk.h
index e2aba15f545d..6d8e61c48563 100644
--- a/trunk/include/linux/virtio_blk.h
+++ b/trunk/include/linux/virtio_blk.h
@@ -41,6 +41,11 @@
 #define VIRTIO_BLK_F_TOPOLOGY	10	/* Topology information is available */
 #define VIRTIO_BLK_F_CONFIG_WCE	11	/* Writeback mode available in config */
 
+#ifndef __KERNEL__
+/* Old (deprecated) name for VIRTIO_BLK_F_WCE. */
+#define VIRTIO_BLK_F_FLUSH VIRTIO_BLK_F_WCE
+#endif
+
 #define VIRTIO_BLK_ID_BYTES	20	/* ID string length */
 
 struct virtio_blk_config {