LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] Documentation/kdbus: replace 'reply_cookie' with 'cookie_reply'
@ 2015-03-16  9:35 David Herrmann
  2015-03-16 19:56 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: David Herrmann @ 2015-03-16  9:35 UTC (permalink / raw)
  To: linux-kernel; +Cc: Greg KH, daniel, tixxdz, Lukasz Skalski, David Herrmann

From: Lukasz Skalski <l.skalski@samsung.com>

The member field is called 'cookie_reply', fix the documentation which
incorrectly used 'reply_cookie'.

Signed-off-by: Lukasz Skalski <l.skalski@samsung.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---
Hi Greg

This is a leftover from the out-of-tree kdbus repository. It was applied after
v3, so it was never included in the kdbus branch. I've rebased it on your branch
now.

Thanks
David

 Documentation/kdbus/kdbus.message.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/kdbus/kdbus.message.xml b/Documentation/kdbus/kdbus.message.xml
index c25000d..5e7c7a3 100644
--- a/Documentation/kdbus/kdbus.message.xml
+++ b/Documentation/kdbus/kdbus.message.xml
@@ -393,7 +393,7 @@ struct kdbus_msg {
                   For a message to be accepted as reply, it must be a direct
                   message to the original sender (not a broadcast and not a
                   signal message), and its
-                  <varname>kdbus_msg.reply_cookie</varname> must match the
+                  <varname>kdbus_msg.cookie_reply</varname> must match the
                   previous message's <varname>kdbus_msg.cookie</varname>.
                 </para><para>
                   Expected replies also temporarily open the policy of the
-- 
2.3.2


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Documentation/kdbus: replace 'reply_cookie' with 'cookie_reply'
  2015-03-16  9:35 [PATCH] Documentation/kdbus: replace 'reply_cookie' with 'cookie_reply' David Herrmann
@ 2015-03-16 19:56 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2015-03-16 19:56 UTC (permalink / raw)
  To: David Herrmann; +Cc: linux-kernel, daniel, tixxdz, Lukasz Skalski

On Mon, Mar 16, 2015 at 10:35:08AM +0100, David Herrmann wrote:
> From: Lukasz Skalski <l.skalski@samsung.com>
> 
> The member field is called 'cookie_reply', fix the documentation which
> incorrectly used 'reply_cookie'.
> 
> Signed-off-by: Lukasz Skalski <l.skalski@samsung.com>
> Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
> ---
> Hi Greg
> 
> This is a leftover from the out-of-tree kdbus repository. It was applied after
> v3, so it was never included in the kdbus branch. I've rebased it on your branch
> now.

Now applied, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-03-16 19:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-16  9:35 [PATCH] Documentation/kdbus: replace 'reply_cookie' with 'cookie_reply' David Herrmann
2015-03-16 19:56 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).