diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-15 21:59:10 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-15 21:59:10 +0300 |
| commit | 101c431492d297dd0d111b461d8d324895676bee (patch) | |
| tree | 06d8a02a4fd91acdd6c31340452e85feaac4ecb7 /arch/s390/configs/default_defconfig | |
| parent | 9c79ddaa0f962d1f26537a670b0652ff509a6fe0 (diff) | |
| parent | 95422dec6bd4a7c57444743f7b1bb375335a6298 (diff) | |
| download | linux-101c431492d297dd0d111b461d8d324895676bee.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/genet/bcmgenet.c
net/core/sock.c
Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390/configs/default_defconfig')
| -rw-r--r-- | arch/s390/configs/default_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig index 143b1e00b818..4b176fe83da4 100644 --- a/arch/s390/configs/default_defconfig +++ b/arch/s390/configs/default_defconfig @@ -609,7 +609,7 @@ CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y CONFIG_FUNCTION_PROFILER=y CONFIG_HIST_TRIGGERS=y CONFIG_TRACE_ENUM_MAP_FILE=y |