diff options
author | 2021-05-11 15:59:18 +0200 | |
---|---|---|
committer | 2021-05-11 15:59:18 +0200 | |
commit | fd531024bad7e5799e968ca70c0d3ca7b96b71ef (patch) | |
tree | a6abb8be6a97c632a1327547a30c7119365e62c0 /tools/perf/scripts/python/netdev-times.py | |
parent | drm: Include <asm/agp.h> iff CONFIG_AGP is set (diff) | |
parent | Linux 5.13-rc1 (diff) | |
download | wireguard-linux-fd531024bad7e5799e968ca70c0d3ca7b96b71ef.tar.xz wireguard-linux-fd531024bad7e5799e968ca70c0d3ca7b96b71ef.zip |
Merge drm/drm-next into drm-misc-next
Backmerging to get v5.12 fixes. Requested for vmwgfx.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'tools/perf/scripts/python/netdev-times.py')
-rw-r--r-- | tools/perf/scripts/python/netdev-times.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/netdev-times.py b/tools/perf/scripts/python/netdev-times.py index ea0c8b90a783..a0cfc7fe5908 100644 --- a/tools/perf/scripts/python/netdev-times.py +++ b/tools/perf/scripts/python/netdev-times.py @@ -356,7 +356,7 @@ def handle_irq_softirq_exit(event_info): return rec_data = {'sirq_ent_t':sirq_ent_t, 'sirq_ext_t':time, 'irq_list':irq_list, 'event_list':event_list} - # merge information realted to a NET_RX softirq + # merge information related to a NET_RX softirq receive_hunk_list.append(rec_data) def handle_napi_poll(event_info): |