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

Merge remote-tracking branch 'torvalds/master' into perf-tools-next 



To pick up changes for other tools/ libraries used by perf and for
header synchronization with the kernel sources originals.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 8cdf00b8 a5806cd5

.clippy.toml

+1 −1
Original line number Diff line number Diff line
@@ -7,5 +7,5 @@ check-private-items = true 
disallowed-macros = [

    # The `clippy::dbg_macro` lint only works with `std::dbg!`, thus we simulate

    # it here, see: https://github.com/rust-lang/rust-clippy/issues/11303.

    { path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool" },

    { path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool", allow-invalid = true },

]

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org> 
Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Arun Kumar Neelakantam <quic_aneela@quicinc.com> <aneela@codeaurora.org>

Asahi Lina <lina+kernel@asahilina.net> <lina@asahilina.net>

Ashok Raj Nagarajan <quic_arnagara@quicinc.com> <arnagara@codeaurora.org>

Ashwin Chaugule <quic_ashwinc@quicinc.com> <ashwinc@codeaurora.org>

Asutosh Das <quic_asutoshd@quicinc.com> <asutoshd@codeaurora.org>
@@ -447,6 +448,8 @@ Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net> 
Luca Weiss <luca@lucaweiss.eu> <luca@z3ntu.xyz>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Luo Jie <quic_luoj@quicinc.com> <luoj@codeaurora.org>

Lance Yang <lance.yang@linux.dev> <ioworker0@gmail.com>

Lance Yang <lance.yang@linux.dev> <mingzhe.yang@ly.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Maciej W. Rozycki <macro@orcam.me.uk> <macro@linux-mips.org>

Maharaja Kennadyrajan <quic_mkenna@quicinc.com> <mkenna@codeaurora.org>
@@ -483,6 +486,7 @@ Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu> 
Matthieu Baerts <matttbe@kernel.org> <matthieu.baerts@tessares.net>

Matthieu CASTET <castet.matthieu@free.fr>

Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>

Mattijs Korpershoek <mkorpershoek@kernel.org> <mkorpershoek@baylibre.com>

Matt Ranostay <matt@ranostay.sg> <matt.ranostay@konsulko.com>

Matt Ranostay <matt@ranostay.sg> <matt@ranostay.consulting>

Matt Ranostay <matt@ranostay.sg> Matthew Ranostay <mranostay@embeddedalley.com>
@@ -749,6 +753,7 @@ Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net> 
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <u.kleine-koenig@baylibre.com> <ukleinek@baylibre.com>

Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Uwe Kleine-König <ukleinek@strlen.de>

Uwe Kleine-König <ukl@pengutronix.de>

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −0
Original line number Diff line number Diff line
@@ -511,6 +511,7 @@ Description: information about CPUs heterogeneity. 


What:		/sys/devices/system/cpu/vulnerabilities

		/sys/devices/system/cpu/vulnerabilities/gather_data_sampling

		/sys/devices/system/cpu/vulnerabilities/indirect_target_selection

		/sys/devices/system/cpu/vulnerabilities/itlb_multihit

		/sys/devices/system/cpu/vulnerabilities/l1tf

		/sys/devices/system/cpu/vulnerabilities/mds

Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd

+2 −2
Original line number Diff line number Diff line 
What:		/sys/bus/hid/drivers/hid-appletb-kbd/<dev>/mode

Date:		September, 2023

KernelVersion:	6.5

Date:		March, 2025

KernelVersion:	6.15

Contact:	linux-input@vger.kernel.org

Description:

		The set of keys displayed on the Touch Bar.

Documentation/admin-guide/hw-vuln/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -23,3 +23,4 @@ are configurable at compile, boot or run time. 
   gather_data_sampling

   reg-file-data-sampling

   rsb

   indirect-target-selection