summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-09-02 19:41:45 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-09-02 19:41:45 +0300
commit501dacbc2435c0198e0c8561f21bceeeeed87293 (patch)
tree95462b670005ecf40fde8aded07d68b11c86c099 /net
parent360bd62dc4943a0754e6cb5637e01b5b43143cfc (diff)
parent113fc08357ad4e8b84caa75402430875d9ac4c1a (diff)
downloadlinux-501dacbc2435c0198e0c8561f21bceeeeed87293.tar.xz
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Thomas Gleixner: "A small set of updates for core code: - Prevent tracing in functions which are called from trace patching via stop_machine() to prevent executing half patched function trace entries. - Remove old GCC workarounds - Remove pointless includes of notifier.h" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Remove workaround for unreachable warnings from old GCC notifier: Remove notifier header file wherever not used watchdog: Mark watchdog touch functions as notrace
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 325fc5088370..82114e1111e6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -93,7 +93,6 @@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/ethtool.h>
-#include <linux/notifier.h>
#include <linux/skbuff.h>
#include <linux/bpf.h>
#include <linux/bpf_trace.h>