From: David S. Miller <davem@davemloft.net>
Date: Fri, 28 Aug 2015 23:27:28 +0000 (-0700)
Subject: Merge branch 'bpf_trace_printk-percent-s'
X-Git-Tag: omap-for-v4.3/fixes-rc1~110^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc7acad135b7228b56977867afb07d3d54f0cdd3;p=pandora-kernel.git

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>
---

cc7acad135b7228b56977867afb07d3d54f0cdd3