Merge branch 'bpf_trace_printk-percent-s'
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2015 23:27:28 +0000 (16:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2015 23:27:28 +0000 (16:27 -0700)
commitcc7acad135b7228b56977867afb07d3d54f0cdd3
tree8934c8b0f6aac4a01488c59c45b8dc55c64cc721
parentc9fd56b34efd06a031cbc918d288f09e38173ff9
parent8d3b7dce8622919da5c5822ef7338d6604c9fe6e
Merge branch 'bpf_trace_printk-percent-s'

Alexei Starovoitov says:

====================
support for '%s' in bpf_trace_printk

v2->v3:
fix the comment to mention that strncpy_from_unsafe() returns
the length of the string including the trailing NUL.

v1->v2:
patch 1: generalize FETCH_FUNC_NAME(memory, string) into
strncpy_from_unsafe()
patch 2: use it in bpf_trace_printk
====================

Signed-off-by: David S. Miller <davem@davemloft.net>