Commit b8fa3e38 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'acme/perf-tools' into perf-tools-next 



To pick up perf-tools fixes just merged upstream.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 0ec73817 55a21105

.clang-format

+1 −1
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ ForEachMacros: 
  - 'for_each_active_dev_scope'

  - 'for_each_active_drhd_unit'

  - 'for_each_active_iommu'

  - 'for_each_active_route'

  - 'for_each_aggr_pgid'

  - 'for_each_available_child_of_node'

  - 'for_each_bench'
@@ -225,7 +226,6 @@ ForEachMacros: 
  - 'for_each_console_srcu'

  - 'for_each_cpu'

  - 'for_each_cpu_and'

  - 'for_each_cpu_not'

  - 'for_each_cpu_wrap'

  - 'for_each_dapm_widgets'

  - 'for_each_dedup_cand'

.gitattributes

+4 −4
Original line number Diff line number Diff line 
*.c   diff=cpp

*.h   diff=cpp

*.dtsi diff=dts

# SPDX-License-Identifier: GPL-2.0-only

*.[ch] diff=cpp

*.dts diff=dts

*.dts[io] diff=dts

.gitignore

+3 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# subdirectories here. Add them in the ".gitignore" file

# in that subdirectory instead.

#

# NOTE! Please use 'git ls-files -i --exclude-standard'

# NOTE! Please use 'git ls-files -i -c --exclude-per-directory=.gitignore'

# command after changing this file, to see if there are

# any tracked files which get ignored after the change.

#
@@ -16,6 +16,7 @@ 
*.bin

*.bz2

*.c.[012]*.*

*.cover

*.dt.yaml

*.dtb

*.dtbo
@@ -33,6 +34,7 @@ 
*.lz4

*.lzma

*.lzo

*.mbx

*.mod

*.mod.c

*.o

.mailmap

+14 −1
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com> 
Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>

Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>

Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>

Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>

Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>

Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
@@ -119,6 +121,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>

Dmitry Baryshkov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -133,6 +136,9 @@ Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com> 
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>

Felipe W Damasio <felipewd@terra.com.br>

Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>
@@ -148,6 +154,7 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com> 
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
@@ -302,6 +309,8 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com> 
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>

Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>

Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>

Mayuresh Janorkar <mayur@ti.com>
@@ -407,7 +416,10 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> 
Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>

Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>

Stephen Hemminger <stephen@networkplumber.org> <sthemmin@vyatta.com>

Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>

Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>

Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
@@ -439,6 +451,7 @@ Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org> 
Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>

Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>

Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>

Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>

Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

CREDITS

+3 −3
Original line number Diff line number Diff line
@@ -1852,11 +1852,11 @@ E: ajoshi@shell.unixbox.com 
D: fbdev hacking



N: Jesper Juhl

E: jj@chaosbits.net

E: jesperjuhl76@gmail.com

D: Various fixes, cleanups and minor features all over the tree.

D: Wrote initial version of the hdaps driver (since passed on to others).

S: Lemnosvej 1, 3.tv

S: 2300 Copenhagen S.

S: Titangade 5G, 2.tv

S: 2200 Copenhagen N.

S: Denmark



N: Jozsef Kadlecsik