Revert "kdbus: add Makefile, Kconfig and MAINTAINERS entry"

This reverts commit c6204bacd7604b96b13c2a444f5f66eb2b1b1cf5.

Conflicts:
	init/Kconfig

diff --git a/MAINTAINERS b/MAINTAINERS
index 8e6bf2fdc69c1ad7df97700214320cf52087d929..9ee8cbbd220304b694959999cb857311b0fd8b2c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5585,19 +5585,6 @@ S:       Maintained
 F:     Documentation/kbuild/kconfig-language.txt
 F:     scripts/kconfig/
 
-KDBUS
-M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-M:     Daniel Mack <daniel@zonque.org>
-M:     David Herrmann <dh.herrmann@googlemail.com>
-M:     Djalal Harouni <tixxdz@opendz.org>
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-F:     ipc/kdbus/*
-F:     samples/kdbus/*
-F:     Documentation/kdbus/*
-F:     include/uapi/linux/kdbus.h
-F:     tools/testing/selftests/kdbus/
-
 KDUMP
 M:     Vivek Goyal <vgoyal@redhat.com>
 M:     Haren Myneni <hbabu@us.ibm.com>

diff --git a/init/Kconfig b/init/Kconfig
index 938807118eeedc6f8b08c7225949021c65d33b70..dc24dec6023292ac6f1bd484ce506074d3e53566 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -261,19 +261,6 @@ config POSIX_MQUEUE_SYSCTL
        depends on SYSCTL
        default y
 
-config KDBUS
-       tristate "kdbus interprocess communication"
-       depends on TMPFS
-       help
-         D-Bus is a system for low-latency, low-overhead, easy to use
-         interprocess communication (IPC).
-
-         See the man-pages and HTML files in Documentation/kdbus/
-         that are generated by 'make mandocs' and 'make htmldocs'.
-
-         If you have an ordinary machine, select M here. The module
-         will be called kdbus.
-
 config CROSS_MEMORY_ATTACH
        bool "Enable process_vm_readv/writev syscalls"
        depends on MMU

diff --git a/ipc/Makefile b/ipc/Makefile
index 68ec4167d11b149854238853481ca9f36571a007..86c7300ecdf5d566111459fe07e7d171e08a192d 100644 (file)
--- a/ipc/Makefile
+++ b/ipc/Makefile
@@ -9,4 +9,4 @@ obj_mq-$(CONFIG_COMPAT) += compat_mq.o
 obj-$(CONFIG_POSIX_MQUEUE) += mqueue.o msgutil.o $(obj_mq-y)
 obj-$(CONFIG_IPC_NS) += namespace.o
 obj-$(CONFIG_POSIX_MQUEUE_SYSCTL) += mq_sysctl.o
-obj-$(CONFIG_KDBUS) += kdbus/
+

diff --git a/ipc/kdbus/Makefile b/ipc/kdbus/Makefile
deleted file mode 100644 (file)
index 7ee9271..0000000
--- a/ipc/kdbus/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-kdbus-y := \
-       bus.o \
-       connection.o \
-       endpoint.o \
-       fs.o \
-       handle.o \
-       item.o \
-       main.o \
-       match.o \
-       message.o \
-       metadata.o \
-       names.o \
-       node.o \
-       notify.o \
-       domain.o \
-       policy.o \
-       pool.o \
-       reply.o \
-       queue.o \
-       util.o
-
-obj-$(CONFIG_KDBUS) += kdbus.o