Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 0 deletions

diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 7f11050746ae..2e0f22298fe9 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -272,6 +272,7 @@ struct trace_event_call {
         int                             perf_refcount;
         struct hlist_head __percpu      *perf_events;
         struct bpf_prog                 *prog;
+        struct perf_event               *bpf_prog_owner;
 
         int     (*perf_perm)(struct trace_event_call *,
                              struct perf_event *);