summaryrefslogtreecommitdiffstats
path: root/kdbus-uapi-Fix-kernel-doc-for-enum-kdbus_send_flags.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-07-08 10:30:06 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-07-08 10:30:06 -0400
commit8be443055ee741775545f3d86cbfd36410c6ef8d (patch)
tree90c6fda25ceb55bee60a1d8a30f436eb3b9e1277 /kdbus-uapi-Fix-kernel-doc-for-enum-kdbus_send_flags.patch
parent84bb446543a6e771a1be4fc09b0712607bc6a376 (diff)
downloadkernel-8be443055ee741775545f3d86cbfd36410c6ef8d.tar.gz
kernel-8be443055ee741775545f3d86cbfd36410c6ef8d.tar.xz
kernel-8be443055ee741775545f3d86cbfd36410c6ef8d.zip
Linux v4.2-rc1-33-gd6ac4ffc61ac
Diffstat (limited to 'kdbus-uapi-Fix-kernel-doc-for-enum-kdbus_send_flags.patch')
-rw-r--r--kdbus-uapi-Fix-kernel-doc-for-enum-kdbus_send_flags.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/kdbus-uapi-Fix-kernel-doc-for-enum-kdbus_send_flags.patch b/kdbus-uapi-Fix-kernel-doc-for-enum-kdbus_send_flags.patch
new file mode 100644
index 000000000..5236343c3
--- /dev/null
+++ b/kdbus-uapi-Fix-kernel-doc-for-enum-kdbus_send_flags.patch
@@ -0,0 +1,24 @@
+From: Sergei Zviagintsev <sergei@s15v.net>
+Date: Thu, 9 Apr 2015 13:11:01 +0300
+Subject: [PATCH] kdbus: uapi: Fix kernel-doc for enum kdbus_send_flags
+
+Signed-off-by: Sergei Zviagintsev <sergei@s15v.net>
+Acked-by: Daniel Mack <daniel@zonque.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/uapi/linux/kdbus.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/uapi/linux/kdbus.h b/include/uapi/linux/kdbus.h
+index 2fe0a1c5056c..00a6e142c977 100644
+--- a/include/uapi/linux/kdbus.h
++++ b/include/uapi/linux/kdbus.h
+@@ -544,7 +544,7 @@ struct kdbus_msg_info {
+ * reply to this message. The
+ * KDBUS_CMD_SEND ioctl() will block
+ * until the reply is received, and
+- * offset_reply in struct kdbus_msg will
++ * reply in struct kdbus_cmd_send will
+ * yield the offset in the sender's pool
+ * where the reply can be found.
+ * This flag is only valid if