The following commit has been merged in the master branch: commit 9204a4f876b229505f4ab947124d1160b80bbb4c Author: Sven Eckelmann sven@narfation.org Date: Mon Apr 13 20:26:07 2020 +0200

batman-adv: trace: Drop unneeded types.h include

The commit 04ae87a52074 ("ftrace: Rework event_create_dir()") restructured various macros in the ftrace framework. These changes also had the nice side effect that the linux/types.h include is no longer necessary to define some of the types used by these macros.

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index f631b1e01b89..a87547570b4e 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -15,7 +15,6 @@ #include <linux/percpu.h> #include <linux/printk.h> #include <linux/tracepoint.h> -#include <linux/types.h>

#undef TRACE_SYSTEM #define TRACE_SYSTEM batadv