Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Jakub Kicinski committed 4 years ago

Commit c59400a2 parents 9c30918 dcb85f8405 files · +4030 −2043Browse files

Showing the changes to scripts (1 of 405 files). Show all

Unified · Split

@@ -25,7 +25,7 @@ HOSTCFLAGS_sorttable.o += -I$(srctree)/tools/arch/x86/include · 24 unmodified lines
25	HOSTCFLAGS_sorttable.o += -DUNWINDER_ORC_ENABLED	25	HOSTCFLAGS_sorttable.o += -DUNWINDER_ORC_ENABLED
26	endif	26	endif
27		27
28	ifdef CONFIG_DYNAMIC_FTRACE	28	ifdef CONFIG_BUILDTIME_MCOUNT_SORT
29	HOSTCFLAGS_sorttable.o += -DMCOUNT_SORT_ENABLED	29	HOSTCFLAGS_sorttable.o += -DMCOUNT_SORT_ENABLED
30	endif	30	endif
31		31