diff options
| author | Mauro Carvalho Chehab <[email protected]> | 2021-08-05 14:28:43 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <[email protected]> | 2021-08-05 14:28:43 +0000 |
| commit | 9c3a0f285248899dfa81585bc5d5bc9ebdb8fead (patch) | |
| tree | 908decd51fbb0e1c774444b002e3b89dee3fae26 /tools/perf/builtin-stat.c | |
| parent | media: venus: venc: add support for V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM co... (diff) | |
| parent | Linux 5.14-rc4 (diff) | |
| download | kernel-9c3a0f285248899dfa81585bc5d5bc9ebdb8fead.tar.gz kernel-9c3a0f285248899dfa81585bc5d5bc9ebdb8fead.zip | |
Merge tag 'v5.14-rc4' into media_tree
Linux 5.14-rc4
* tag 'v5.14-rc4': (948 commits)
Linux 5.14-rc4
pipe: make pipe writes always wake up readers
Revert "perf map: Fix dso->nsinfo refcounting"
mm/memcg: fix NULL pointer dereference in memcg_slab_free_hook()
slub: fix unreclaimable slab stat for bulk free
mm/migrate: fix NR_ISOLATED corruption on 64-bit
mm: memcontrol: fix blocking rstat function called from atomic cgroup1 thresholding code
ocfs2: issue zeroout to EOF blocks
ocfs2: fix zero out valid data
lib/test_string.c: move string selftest in the Runtime Testing menu
gve: Update MAINTAINERS list
arch: Kconfig: clean up obsolete use of HAVE_IDE
can: esd_usb2: fix memory leak
can: ems_usb: fix memory leak
can: usb_8dev: fix memory leak
can: mcba_usb_start(): add missing urb->transfer_dma initialization
can: hi311x: fix a signedness bug in hi3110_cmd()
MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver
scsi: fas216: Fix fall-through warning for Clang
scsi: acornscsi: Fix fall-through warning for clang
...
Diffstat (limited to 'tools/perf/builtin-stat.c')
| -rw-r--r-- | tools/perf/builtin-stat.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index d25cb8088e8c..634375937db9 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -2445,9 +2445,6 @@ int cmd_stat(int argc, const char **argv) evlist__check_cpu_maps(evsel_list); - if (perf_pmu__has_hybrid()) - stat_config.no_merge = true; - /* * Initialize thread_map with comm names, * so we could print it out on output. |