---

yaml
---
r: 211662
b: refs/heads/master
c: 68eda8f
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94ebd235c493f43681f609b0e02733337053e8f0
+refs/heads/master: 68eda8f59081c74a51d037cc29893bd7c9b3c2d8

trunk/MAINTAINERS

@@ -1527,8 +1527,6 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 S:	Supported
 F:	Documentation/filesystems/ceph.txt
 F:	fs/ceph
-F:	net/ceph
-F:	include/linux/ceph
 
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 M:	David Vrabel <david.vrabel@csr.com>
@@ -4807,15 +4805,6 @@ F:	fs/qnx4/
 F:	include/linux/qnx4_fs.h
 F:	include/linux/qnxtypes.h
 
-RADOS BLOCK DEVICE (RBD)
-F:	include/linux/qnxtypes.h
-M:	Yehuda Sadeh <yehuda@hq.newdream.net>
-M:	Sage Weil <sage@newdream.net>
-M:	ceph-devel@vger.kernel.org
-S:	Supported
-F:	drivers/block/rbd.c
-F:	drivers/block/rbd_types.h
-
 RADEON FRAMEBUFFER DISPLAY DRIVER
 M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>
 L:	linux-fbdev@vger.kernel.org

trunk/drivers/block/Kconfig

@@ -488,21 +488,4 @@ config BLK_DEV_HD
 
 	  If unsure, say N.
 
-config BLK_DEV_RBD
-	tristate "Rados block device (RBD)"
-	depends on INET && EXPERIMENTAL && BLOCK
-	select CEPH_LIB
-	select LIBCRC32C
-	select CRYPTO_AES
-	select CRYPTO
-	default n
-	help
-	  Say Y here if you want include the Rados block device, which stripes
-	  a block device over objects stored in the Ceph distributed object
-	  store.
-
-	  More information at http://ceph.newdream.net/.
-
-	  If unsure, say N.
-
 endif # BLK_DEV

trunk/drivers/block/Makefile

@@ -37,6 +37,5 @@ obj-$(CONFIG_BLK_DEV_HD)	+= hd.o
 
 obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
 obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/
-obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o
 
 swim_mod-objs	:= swim.o swim_asm.o