projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: fd3a594 45fc462)
Merge tag 'perf-tools-for-v6.6-1-2023-09-05' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Sep 2023 03:06:17 +0000 (20:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Sep 2023 03:06:17 +0000 (20:06 -0700)
Pull perf tools updates from Arnaldo Carvalho de Melo:
 "perf tools maintainership:

   - Add git information for perf-tools and perf-tools-next trees and
     branches to the MAINTAINERS file. That is where development now
     takes place and myself and Namhyung Kim have write access, more
     people to come as we emulate other maintainer groups.

  perf record:

   - Record kernel data maps when 'perf record --data' is used, so that
     global variables can be resolved and used in tools that do data
     profiling.

  perf trace:

   - Remove the old, experimental support for BPF events in which a .c
     file was passed as an event: "perf trace -e hello.c" to then get
     compiled and loaded.

     The only known usage for that, that shipped with the kernel as an
     example for such events, augmented the raw_syscalls tracepoints and
     was converted to a libbpf skeleton, reusing all the user space
     components and the BPF code connected to the syscalls.

     In the end just the way to glue the BPF part and the user space
     type beautifiers changed, now being performed by libbpf skeletons.

     The next step is to use BTF to do pretty printing of all syscall
     types, as discussed with Alan Maguire and others.

     Now, on a perf built with BUILD_BPF_SKEL=1 we get most if not all
     path/filenames/strings, some of the networking data structures,
     perf_event_attr, etc, i.e. systemwide tracing of nanosleep calls
     and perf_event_open syscalls while 'perf stat' runs 'sleep' for 5
     seconds:

      # perf trace -a -e *nanosleep,perf* perf stat -e cycles,instructions sleep 5
         0.000 (   9.034 ms): perf/327641 perf_event_open(attr_uptr: { type: 0 (PERF_TYPE_HARDWARE), size: 136, config: 0 (PERF_COUNT_HW_CPU_CYCLES), sample_type: IDENTIFIER, read_format: TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING, disabled: 1, inherit: 1, enable_on_exec: 1, exclude_guest: 1 }, pid: 327642 (perf), cpu: -1, group_fd: -1, flags: FD_CLOEXEC) = 3
         9.039 (   0.006 ms): perf/327641 perf_event_open(attr_uptr: { type: 0 (PERF_TYPE_HARDWARE), size: 136, config: 0x1 (PERF_COUNT_HW_INSTRUCTIONS), sample_type: IDENTIFIER, read_format: TOTAL_TIME_ENABLED|TOTAL_TIME_RUNNING, disabled: 1, inherit: 1, enable_on_exec: 1, exclude_guest: 1 }, pid: 327642 (perf-exec), cpu: -1, group_fd: -1, flags: FD_CLOEXEC) = 4
             ? (           ): gpm/991  ... [continued]: clock_nanosleep())               = 0
        10.133 (           ): sleep/327642 clock_nanosleep(rqtp: { .tv_sec: 5, .tv_nsec: 0 }, rmtp: 0x7ffd36f83ed0) ...
             ? (           ): pool-gsd-smart/3051  ... [continued]: clock_nanosleep())   = 0
        30.276 (           ): gpm/991 clock_nanosleep(rqtp: { .tv_sec: 2, .tv_nsec: 0 }, rmtp: 0x7ffcc6f73710) ...
       223.215 (1000.430 ms): pool-gsd-smart/3051 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 0 }, rmtp: 0x7f6e7fffec90) = 0
        30.276 (2000.394 ms): gpm/991  ... [continued]: clock_nanosleep())               = 0
      1230.814 (           ): pool-gsd-smart/3051 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 0 }, rmtp: 0x7f6e7fffec90) ...
      1230.814 (1000.404 ms): pool-gsd-smart/3051  ... [continued]: clock_nanosleep())   = 0
      2030.886 (           ): gpm/991 clock_nanosleep(rqtp: { .tv_sec: 2, .tv_nsec: 0 }, rmtp: 0x7ffcc6f73710) ...
      2237.709 (1000.153 ms): pool-gsd-smart/3051 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 0 }, rmtp: 0x7f6e7fffec90) = 0
             ? (           ): crond/1172  ... [continued]: clock_nanosleep())            = 0
      3242.699 (           ): pool-gsd-smart/3051 clock_nanosleep(rqtp: { .tv_sec: 1, .tv_nsec: 0 }, rmtp: 0x7f6e7fffec90) ...
      2030.886 (2000.385 ms): gpm/991  ... [continued]: clock_nanosleep())               = 0
      3728.078 (           ): crond/1172 clock_nanosleep(rqtp: { .tv_sec: 60, .tv_nsec: 0 }, rmtp: 0x7ffe0971dcf0) ...
      3242.699 (1000.158 ms): pool-gsd-smart/3051  ... [continued]: clock_nanosleep())   = 0
      4031.409 (           ): gpm/991 clock_nanosleep(rqtp: { .tv_sec: 2, .tv_nsec: 0 }, rmtp: 0x7ffcc6f73710) ...
        10.133 (5000.375 ms): sleep/327642  ... [continued]: clock_nanosleep())          = 0

      Performance counter stats for 'sleep 5':

             2,617,347      cycles
             1,855,997      instructions                     #    0.71  insn per cycle

           5.002282128 seconds time elapsed

           0.000855000 seconds user
           0.000852000 seconds sys

  perf annotate:

   - Building with binutils' libopcode now is opt-in (BUILD_NONDISTRO=1)
     for licensing reasons, and we missed a build test on
     tools/perf/tests makefile.

     Since we now default to NDEBUG=1, we ended up segfaulting when
     building with BUILD_NONDISTRO=1 because a needed initialization
     routine was being "error checked" via an assert.

     Fix it by explicitly checking the result and aborting instead if it
     fails.

     We better back propagate the error, but at least 'perf annotate' on
     samples collected for a BPF program is back working when perf is
     built with BUILD_NONDISTRO=1.

  perf report/top:

   - Add back TUI hierarchy mode header, that is seen when using 'perf
     report/top --hierarchy'.

   - Fix the number of entries for 'e' key in the TUI that was
     preventing navigation of lines when expanding an entry.

  perf report/script:

   - Support cross platform register handling, allowing a perf.data file
     collected on one architecture to have registers sampled correctly
     displayed when analysis tools such as 'perf report' and 'perf
     script' are used on a different architecture.

   - Fix handling of event attributes in pipe mode, i.e. when one uses:

   perf record -o - | perf report -i -

     When no perf.data files are used.

   - Handle files generated via pipe mode with a version of perf and
     then read also via pipe mode with a different version of perf,
     where the event attr record may have changed, use the record size
     field to properly support this version mismatch.

  perf probe:

   - Accessing global variables from uprobes isn't supported, make the
     error message state that instead of stating that some minimal
     kernel version is needed to have that feature. This seems just a
     tool limitation, the kernel probably has all that is needed.

  perf tests:

   - Fix a reference count related leak in the dlfilter v0 API where the
     result of a thread__find_symbol_fb() is not matched with an
     addr_location__exit() to drop the reference counts of the resolved
     components (machine, thread, map, symbol, etc). Add a dlfilter test
     to make sure that doesn't regresses.

   - Lots of fixes for the 'perf test' written in shell script related
     to problems found with the shellcheck utility.

   - Fixes for 'perf test' shell scripts testing features enabled when
     perf is built with BUILD_BPF_SKEL=1, such as 'perf stat' bpf
     counters.

   - Add perf record sample filtering test, things like the following
     example, that gets implemented as a BPF filter attached to the
     event:

       # perf record -e task-clock -c 10000 --filter 'ip < 0xffffffff00000000'

   - Improve the way the task_analyzer test checks if libtraceevent is
     linked, using 'perf version --build-options' instead of the more
     expensinve 'perf record -e "sched:sched_switch"'.

   - Add support for riscv in the mmap-basic test. (This went as well
     via the RiscV tree, same contents).

  libperf:

   - Implement riscv mmap support (This went as well via the RiscV tree,
     same contents).

  perf script:

   - New tool that converts perf.data files to the firefox profiler
     format so that one can use the visualizer at
     https://profiler.firefox.com/. Done by Anup Sharma as part of this
     year's Google Summer of Code.

     One can generate the output and upload it to the web interface but
     Anup also automated everything:

       perf script gecko -F 99 -a sleep 60

   - Support syscall name parsing on arm64.

   - Print "cgroup" field on the same line as "comm".

  perf bench:

   - Add new 'uprobe' benchmark to measure the overhead of uprobes
     with/without BPF programs attached to it.

   - breakpoints are not available on power9, skip that test.

  perf stat:

   - Add #num_cpus_online literal to be used in 'perf stat' metrics, and
     add this extra 'perf test' check that exemplifies its purpose:

   TEST_ASSERT_VAL("#num_cpus_online",
                         expr__parse(&num_cpus_online, ctx, "#num_cpus_online") == 0);
   TEST_ASSERT_VAL("#num_cpus", expr__parse(&num_cpus, ctx, "#num_cpus") == 0);
   TEST_ASSERT_VAL("#num_cpus >= #num_cpus_online", num_cpus >= num_cpus_online);

  Miscellaneous:

   - Improve tool startup time by lazily reading PMU, JSON, sysfs data.

   - Improve error reporting in the parsing of events, passing YYLTYPE
     to error routines, so that the output can show were the parsing
     error was found.

   - Add 'perf test' entries to check the parsing of events
     improvements.

   - Fix various leak for things detected by -fsanitize=address, mostly
     things that would be freed at tool exit, including:

       - Free evsel->filter on the destructor.

       - Allow tools to register a thread->priv destructor and use it in
         'perf trace'.

       - Free evsel->priv in 'perf trace'.

       - Free string returned by synthesize_perf_probe_point() when the
         caller fails to do all it needs.

   - Adjust various compiler options to not consider errors some
     warnings when building with broken headers found in things like
     python, flex, bison, as we otherwise build with -Werror. Some for
     gcc, some for clang, some for some specific version of those, some
     for some specific version of flex or bison, or some specific
     combination of these components, bah.

   - Allow customization of clang options for BPF target, this helps
     building on gentoo where there are other oddities where BPF targets
     gets passed some compiler options intended for the native build, so
     building with WERROR=0 helps while these oddities are fixed.

   - Dont pass ERR_PTR() values to perf_session__delete() in 'perf top'
     and 'perf lock', fixing some segfaults when handling some odd
     failures.

   - Add LTO build option.

   - Fix format of unordered lists in the perf docs
     (tools/perf/Documentation)

   - Overhaul the bison files, using constructs such as YYNOMEM.

   - Remove unused tokens from the bison .y files.

   - Add more comments to various structs.

   - A few LoongArch enablement patches.

  Vendor events (JSON):

   - Add JSON metrics for Yitian 710 DDR (aarch64). Things like:

   EventName, BriefDescription
   visible_window_limit_reached_rd, "At least one entry in read queue reaches the visible window limit.",
   visible_window_limit_reached_wr, "At least one entry in write queue reaches the visible window limit.",
   op_is_dqsosc_mpc        , "A DQS Oscillator MPC command to DRAM.",
   op_is_dqsosc_mrr        , "A DQS Oscillator MRR command to DRAM.",
   op_is_tcr_mrr        , "A Temperature Compensated Refresh(TCR) MRR command to DRAM.",

   - Add AmpereOne metrics (aarch64).

   - Update N2 and V2 metrics (aarch64) and events using Arm telemetry
     repo.

   - Update scale units and descriptions of common topdown metrics on
     aarch64. Things like:
       - "MetricExpr": "stall_slot_frontend / (#slots * cpu_cycles)",
       - "BriefDescription": "Frontend bound L1 topdown metric",
       + "MetricExpr": "100 * (stall_slot_frontend / (#slots * cpu_cycles))",
       + "BriefDescription": "This metric is the percentage of total slots that were stalled due to resource constraints in the frontend of the processor.",

   - Update events for intel: meteorlake to 1.04, sapphirerapids to
     1.15, Icelake+ metric constraints.

   - Update files for the power10 platform"

* tag 'perf-tools-for-v6.6-1-2023-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools: (217 commits)
  perf parse-events: Fix driver config term
  perf parse-events: Fixes relating to no_value terms
  perf parse-events: Fix propagation of term's no_value when cloning
  perf parse-events: Name the two term enums
  perf list: Don't print Unit for "default_core"
  perf vendor events intel: Fix modifier in tma_info_system_mem_parallel_reads for skylake
  perf dlfilter: Avoid leak in v0 API test use of resolve_address()
  perf metric: Add #num_cpus_online literal
  perf pmu: Remove str from perf_pmu_alias
  perf parse-events: Make common term list to strbuf helper
  perf parse-events: Minor help message improvements
  perf pmu: Avoid uninitialized use of alias->str
  perf jevents: Use "default_core" for events with no Unit
  perf test stat_bpf_counters_cgrp: Enhance perf stat cgroup BPF counter test
  perf test shell stat_bpf_counters: Fix test on Intel
  perf test shell record_bpf_filter: Skip 6.2 kernel
  libperf: Get rid of attr.id field
  perf tools: Convert to perf_record_header_attr_id()
  libperf: Add perf_record_header_attr_id()
  perf tools: Handle old data in PERF_RECORD_ATTR
  ...

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
tools/build/feature/Makefile patch | diff1 | diff2 | blob | history
tools/perf/bench/Build patch | diff1 | diff2 | blob | history
tools/perf/bench/bench.h patch | diff1 | diff2 | blob | history
tools/perf/builtin-bench.c patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index ed37d04,db62e8b..42459a3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -915,18 -915,6 +915,18 @@@ S:       Supporte
  F:    drivers/crypto/ccp/sev*
  F:    include/uapi/linux/psp-sev.h
  
 +AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER - DBC SUPPORT
 +M:    Mario Limonciello <mario.limonciello@amd.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Supported
 +F:    drivers/crypto/ccp/dbc.c
 +F:    drivers/crypto/ccp/dbc.h
 +F:    drivers/crypto/ccp/platform-access.c
 +F:    drivers/crypto/ccp/platform-access.h
 +F:    include/uapi/linux/psp-dbc.h
 +F:    tools/crypto/ccp/*.c
 +F:    tools/crypto/ccp/*.py
 +
  AMD DISPLAY CORE
  M:    Harry Wentland <harry.wentland@amd.com>
  M:    Leo Li <sunpeng.li@amd.com>
@@@ -1018,7 -1006,7 +1018,7 @@@ AMD PMC DRIVE
  M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/amd/pmc.c
 +F:    drivers/platform/x86/amd/pmc/
  
  AMD PMF DRIVER
  M:    Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
@@@ -1086,6 -1074,7 +1086,6 @@@ F:      include/soc/amlogic
  
  AMPHION VPU CODEC V4L2 DRIVER
  M:    Ming Qian <ming.qian@nxp.com>
 -M:    Shijie Qin <shijie.qin@nxp.com>
  M:    Zhou Peng <eagle.zhou@nxp.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
@@@ -1569,10 -1558,9 +1569,10 @@@ M:    Olof Johansson <olof@lixom.net
  M:    soc@kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +P:    Documentation/process/maintainer-soc.rst
  C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
 -F:    Documentation/process/maintainer-soc.rst
 +F:    Documentation/process/maintainer-soc*.rst
  F:    arch/arm/boot/dts/Makefile
  F:    arch/arm64/boot/dts/Makefile
  
@@@ -1855,7 -1843,6 +1855,7 @@@ F:      Documentation/devicetree/bindings/ph
  F:    arch/arm/boot/dts/amlogic/
  F:    arch/arm/mach-meson/
  F:    arch/arm64/boot/dts/amlogic/
 +F:    drivers/genpd/amlogic/
  F:    drivers/mmc/host/meson*
  F:    drivers/phy/amlogic/
  F:    drivers/pinctrl/meson/
@@@ -1918,7 -1905,6 +1918,7 @@@ F:      drivers/bluetooth/hci_bcm4377.
  F:    drivers/clk/clk-apple-nco.c
  F:    drivers/cpufreq/apple-soc-cpufreq.c
  F:    drivers/dma/apple-admac.c
 +F:    drivers/genpd/apple/
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/iommu/apple-dart.c
@@@ -2353,7 -2339,7 +2353,7 @@@ F:      drivers/phy/mediatek
  ARM/MICROCHIP (ARM64) SoC support
  M:    Conor Dooley <conor@kernel.org>
  M:    Nicolas Ferre <nicolas.ferre@microchip.com>
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
@@@ -2362,7 -2348,7 +2362,7 @@@ F:      arch/arm64/boot/dts/microchip
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  M:    Alexandre Belloni <alexandre.belloni@bootlin.com>
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  W:    http://www.linux4sam.org
@@@ -2435,7 -2421,6 +2435,7 @@@ F:      arch/arm/mach-ux500
  F:    drivers/clk/clk-nomadik.c
  F:    drivers/clocksource/clksrc-dbx500-prcmu.c
  F:    drivers/dma/ste_dma40*
 +F:    drivers/genpd/st/ste-ux500-pm-domain.c
  F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
  F:    drivers/iio/adc/ab8500-gpadc.c
@@@ -2508,6 -2493,16 +2508,6 @@@ S:     Maintaine
  W:    http://www.digriz.org.uk/ts78xx/kernel
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 -ARM/OXNAS platform support
 -M:    Neil Armstrong <neil.armstrong@linaro.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    linux-oxnas@groups.io (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/boot/dts/ox8*.dts*
 -F:    arch/arm/mach-oxnas/
 -F:    drivers/power/reset/oxnas-restart.c
 -N:    oxnas
 -
  ARM/QUALCOMM CHROMEBOOK SUPPORT
  R:    cros-qcom-dts-watchers@chromium.org
  F:    arch/arm64/boot/dts/qcom/sc7180*
@@@ -2598,7 -2593,6 +2598,7 @@@ F:      arch/arm/include/debug/renesas-scif.
  F:    arch/arm/mach-shmobile/
  F:    arch/arm64/boot/dts/renesas/
  F:    arch/riscv/boot/dts/renesas/
 +F:    drivers/genpd/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  K:    \brenesas,
@@@ -2641,7 -2635,6 +2641,7 @@@ R:      Alim Akhtar <alim.akhtar@samsung.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
 +P:    Documentation/process/maintainer-soc-clean-dts.rst
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
  B:    mailto:linux-samsung-soc@vger.kernel.org
  C:    irc://irc.libera.chat/linux-exynos
@@@ -2936,13 -2929,14 +2936,13 @@@ M:   Sudeep Holla <sudeep.holla@arm.com
  M:    Lorenzo Pieralisi <lpieralisi@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    */*/*/vexpress*
 -F:    */*/vexpress*
 -F:    arch/arm/boot/dts/arm/vexpress*
 +N:    mps2
 +N:    vexpress
  F:    arch/arm/mach-versatile/
  F:    arch/arm64/boot/dts/arm/
 -F:    drivers/clk/versatile/clk-vexpress-osc.c
  F:    drivers/clocksource/timer-versatile.c
 -N:    mps2
 +X:    drivers/cpufreq/vexpress-spc-cpufreq.c
 +X:    Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml
  
  ARM/VFP SUPPORT
  M:    Russell King <linux@armlinux.org.uk>
@@@ -3256,7 -3250,7 +3256,7 @@@ F:      include/uapi/linux/atm
  
  ATMEL MACB ETHERNET DRIVER
  M:    Nicolas Ferre <nicolas.ferre@microchip.com>
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  S:    Supported
  F:    drivers/net/ethernet/cadence/
  
@@@ -3691,7 -3685,6 +3691,7 @@@ F:      include/linux/filter.
  F:    include/linux/tnum.h
  F:    kernel/bpf/core.c
  F:    kernel/bpf/dispatcher.c
 +F:    kernel/bpf/mprog.c
  F:    kernel/bpf/syscall.c
  F:    kernel/bpf/tnum.c
  F:    kernel/bpf/trampoline.c
@@@ -3702,7 -3695,7 +3702,7 @@@ R:      David Vernet <void@manifault.com
  L:    bpf@vger.kernel.org
  L:    bpf@ietf.org
  S:    Maintained
 -F:    Documentation/bpf/instruction-set.rst
 +F:    Documentation/bpf/standardization/
  
  BPF [GENERAL] (Safe Dynamic Programs and Tools)
  M:    Alexei Starovoitov <ast@kernel.org>
@@@ -3710,7 -3703,7 +3710,7 @@@ M:      Daniel Borkmann <daniel@iogearbox.ne
  M:    Andrii Nakryiko <andrii@kernel.org>
  R:    Martin KaFai Lau <martin.lau@linux.dev>
  R:    Song Liu <song@kernel.org>
 -R:    Yonghong Song <yhs@fb.com>
 +R:    Yonghong Song <yonghong.song@linux.dev>
  R:    John Fastabend <john.fastabend@gmail.com>
  R:    KP Singh <kpsingh@kernel.org>
  R:    Stanislav Fomichev <sdf@google.com>
@@@ -3749,7 -3742,7 +3749,7 @@@ F:      tools/lib/bpf
  F:    tools/testing/selftests/bpf/
  
  BPF [ITERATOR]
 -M:    Yonghong Song <yhs@fb.com>
 +M:    Yonghong Song <yonghong.song@linux.dev>
  L:    bpf@vger.kernel.org
  S:    Maintained
  F:    kernel/bpf/*iter.c
@@@ -3785,15 -3778,13 +3785,15 @@@ L:   netdev@vger.kernel.or
  S:    Maintained
  F:    kernel/bpf/bpf_struct*
  
 -BPF [NETWORKING] (tc BPF, sock_addr)
 +BPF [NETWORKING] (tcx & tc BPF, sock_addr)
  M:    Martin KaFai Lau <martin.lau@linux.dev>
  M:    Daniel Borkmann <daniel@iogearbox.net>
  R:    John Fastabend <john.fastabend@gmail.com>
  L:    bpf@vger.kernel.org
  L:    netdev@vger.kernel.org
  S:    Maintained
 +F:    include/net/tcx.h
 +F:    kernel/bpf/tcx.c
  F:    net/core/filter.c
  F:    net/sched/act_bpf.c
  F:    net/sched/cls_bpf.c
@@@ -3845,15 -3836,6 +3845,15 @@@ S:    Maintaine
  F:    kernel/bpf/stackmap.c
  F:    kernel/trace/bpf_trace.c
  
 +BROADCOM ASP 2.0 ETHERNET DRIVER
 +M:    Justin Chen <justin.chen@broadcom.com>
 +M:    Florian Fainelli <florian.fainelli@broadcom.com>
 +L:    bcm-kernel-feedback-list@broadcom.com
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml
 +F:    drivers/net/ethernet/broadcom/asp2/
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <michael.chan@broadcom.com>
  L:    netdev@vger.kernel.org
@@@ -4026,7 -4008,7 +4026,7 @@@ F:      arch/mips/kernel/*bmips
  F:    drivers/irqchip/irq-bcm63*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
 -F:    drivers/soc/bcm/bcm63xx
 +F:    drivers/genpd/bcm/bcm63xx-power.c
  F:    include/linux/bcm963xx_nvram.h
  F:    include/linux/bcm963xx_tag.h
  
@@@ -4144,7 -4126,7 +4144,7 @@@ BROADCOM BCM6348/BCM6358 SPI controlle
  M:    Jonas Gorski <jonas.gorski@gmail.com>
  L:    linux-spi@vger.kernel.org
  S:    Odd Fixes
 -F:    Documentation/devicetree/bindings/spi/spi-bcm63xx.txt
 +F:    Documentation/devicetree/bindings/spi/brcm,bcm63xx-spi.yaml
  F:    drivers/spi/spi-bcm63xx.c
  
  BROADCOM ETHERNET PHY DRIVERS
@@@ -4213,7 -4195,7 +4213,7 @@@ BROADCOM KONA GPIO DRIVE
  M:    Ray Jui <rjui@broadcom.com>
  R:    Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
  S:    Supported
 -F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.yaml
  F:    drivers/gpio/gpio-bcm-kona.c
  
  BROADCOM MPI3 STORAGE CONTROLLER DRIVER
@@@ -4248,7 -4230,7 +4248,7 @@@ R:      Broadcom internal kernel review lis
  L:    linux-pm@vger.kernel.org
  S:    Maintained
  T:    git https://github.com/broadcom/stblinux.git
 -F:    drivers/soc/bcm/bcm63xx/bcm-pmb.c
 +F:    drivers/genpd/bcm/bcm-pmb.c
  F:    include/dt-bindings/soc/bcm-pmb.h
  
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
@@@ -4468,7 -4450,6 +4468,7 @@@ M:      Maxime Ripard <mripard@kernel.org
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/cdns,*.txt
 +F:    Documentation/devicetree/bindings/media/cdns,csi2rx.yaml
  F:    drivers/media/platform/cadence/cdns-csi2*
  
  CADENCE NAND DRIVER
@@@ -4838,7 -4819,6 +4838,7 @@@ F:      drivers/input/touchscreen/chipone_ic
  
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Benson Leung <bleung@chromium.org>
 +M:    Tzung-Bi Shih <tzungbi@kernel.org>
  L:    chrome-platform@lists.linux.dev
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
@@@ -4906,11 -4886,7 +4906,11 @@@ L:    alsa-devel@alsa-project.org (moderat
  L:    patches@opensource.cirrus.com
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
 +F:    drivers/mfd/cs42l43*
 +F:    drivers/pinctrl/cirrus/pinctrl-cs42l43*
 +F:    drivers/spi/spi-cs42l43*
  F:    include/dt-bindings/sound/cs*
 +F:    include/linux/mfd/cs42l43*
  F:    include/sound/cs*
  F:    sound/pci/hda/cs*
  F:    sound/pci/hda/hda_cs_dsp_ctl.*
@@@ -5255,8 -5231,6 +5255,8 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
  F:    kernel/cgroup/cpuset.c
 +F:    tools/testing/selftests/cgroup/test_cpuset.c
 +F:    tools/testing/selftests/cgroup/test_cpuset_prs.sh
  
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <hannes@cmpxchg.org>
@@@ -5395,7 -5369,7 +5395,7 @@@ M:      Kukjin Kim <kgene@kernel.org
  R:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    linux-pm@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  F:    arch/arm/mach-exynos/pm.c
  F:    drivers/cpuidle/cpuidle-exynos.c
  F:    include/linux/platform_data/cpuidle-exynos.h
@@@ -6035,7 -6009,7 +6035,7 @@@ F:      Documentation/devicetree/bindings/mf
  F:    Documentation/devicetree/bindings/mfd/dlg,da90*.yaml
  F:    Documentation/devicetree/bindings/regulator/da92*.txt
  F:    Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
 -F:    Documentation/devicetree/bindings/regulator/slg51000.txt
 +F:    Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml
  F:    Documentation/devicetree/bindings/sound/da[79]*.txt
  F:    Documentation/devicetree/bindings/thermal/da90??-thermal.txt
  F:    Documentation/devicetree/bindings/watchdog/da90??-wdt.txt
@@@ -6118,7 -6092,7 +6118,7 @@@ F:      include/video/udlfb.
  DISTRIBUTED LOCK MANAGER (DLM)
  M:    Christine Caulfield <ccaulfie@redhat.com>
  M:    David Teigland <teigland@redhat.com>
 -L:    cluster-devel@redhat.com
 +L:    gfs2@lists.linux.dev
  S:    Supported
  W:    http://sources.redhat.com/cluster/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
@@@ -6177,9 -6151,10 +6177,9 @@@ F:     kernel/dma
  DMA-BUF HEAPS FRAMEWORK
  M:    Sumit Semwal <sumit.semwal@linaro.org>
  R:    Benjamin Gaignard <benjamin.gaignard@collabora.com>
 -R:    Liam Mark <lmark@codeaurora.org>
 -R:    Laura Abbott <labbott@redhat.com>
  R:    Brian Starkey <Brian.Starkey@arm.com>
  R:    John Stultz <jstultz@google.com>
 +R:    T.J. Mercier <tjmercier@google.com>
  L:    linux-media@vger.kernel.org
  L:    dri-devel@lists.freedesktop.org
  L:    linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
@@@ -6239,7 -6214,6 +6239,7 @@@ DOCUMENTATION PROCES
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    workflows@vger.kernel.org
  S:    Maintained
 +F:    Documentation/maintainer/
  F:    Documentation/process/
  
  DOCUMENTATION REPORTING ISSUES
@@@ -6277,17 -6251,11 +6277,17 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml
  F:    drivers/media/i2c/dw9714.c
  
 -DONGWOON DW9768 LENS VOICE COIL DRIVER
 -M:    Dongchun Zhu <dongchun.zhu@mediatek.com>
 +DONGWOON DW9719 LENS VOICE COIL DRIVER
 +M:    Daniel Scally <djrscally@gmail.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/i2c/dw9719.c
 +
 +DONGWOON DW9768 LENS VOICE COIL DRIVER
 +L:    linux-media@vger.kernel.org
 +S:    Orphan
 +T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9768.yaml
  F:    drivers/media/i2c/dw9768.c
  
@@@ -6428,7 -6396,6 +6428,7 @@@ F:      drivers/gpu/drm/aspeed
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <airlied@redhat.com>
  R:    Thomas Zimmermann <tzimmermann@suse.de>
 +R:    Jocelyn Falempe <jfalempe@redhat.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6580,7 -6547,6 +6580,7 @@@ F:      drivers/gpu/drm/panel/panel-mantix-m
  DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
  M:    Dave Airlie <airlied@redhat.com>
  R:    Thomas Zimmermann <tzimmermann@suse.de>
 +R:    Jocelyn Falempe <jfalempe@redhat.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6980,13 -6946,6 +6980,13 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/lima/
  F:    include/uapi/drm/lima_drm.h
  
 +DRM DRIVERS FOR LOONGSON
 +M:    Sui Jingfeng <suijingfeng@loongson.cn>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/loongson/
 +
  DRM DRIVERS FOR MEDIATEK
  M:    Chun-Kuang Hu <chunkuang.hu@kernel.org>
  M:    Philipp Zabel <p.zabel@pengutronix.de>
@@@ -7056,7 -7015,7 +7056,7 @@@ F:      drivers/gpu/drm/st
  
  DRM DRIVERS FOR TI KEYSTONE
  M:    Jyri Sarha <jyri.sarha@iki.fi>
 -M:    Tomi Valkeinen <tomba@kernel.org>
 +M:    Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7067,18 -7026,16 +7067,18 @@@ F:   drivers/gpu/drm/tidss
  
  DRM DRIVERS FOR TI LCDC
  M:    Jyri Sarha <jyri.sarha@iki.fi>
 -R:    Tomi Valkeinen <tomba@kernel.org>
 +M:    Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/tilcdc/
  F:    drivers/gpu/drm/tilcdc/
  
  DRM DRIVERS FOR TI OMAP
 -M:    Tomi Valkeinen <tomba@kernel.org>
 +M:    Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/ti/
  F:    drivers/gpu/drm/omapdrm/
  
@@@ -7636,13 -7593,6 +7636,13 @@@ L:    linux-mmc@vger.kernel.or
  S:    Supported
  F:    drivers/mmc/host/cqhci*
  
 +EMS CPC-PCI CAN DRIVER
 +M:    Gerhard Uttenthaler <uttenthaler@ems-wuensche.com>
 +M:    support@ems-wuensche.com
 +L:    linux-can@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/can/sja1000/ems_pci.c
 +
  EMULEX 10Gbps iSCSI - OneConnect DRIVER
  M:    Ketan Mukadam <ketan.mukadam@broadcom.com>
  L:    linux-scsi@vger.kernel.org
@@@ -7782,7 -7732,6 +7782,7 @@@ F:      include/linux/mii.
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
 +F:    include/linux/phylib_stubs.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
  F:    include/linux/platform_data/mdio-gpio.h
  F:    include/trace/events/mdio.h
@@@ -8402,6 -8351,7 +8402,6 @@@ L:      linuxppc-dev@lists.ozlabs.or
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/freescale/fs_enet/
 -F:    include/linux/fs_enet_pd.h
  
  FREESCALE SOC SOUND DRIVERS
  M:    Shengjiu Wang <shengjiu.wang@gmail.com>
@@@ -8452,6 -8402,13 +8452,6 @@@ F:     Documentation/power/freezing-of-task
  F:    include/linux/freezer.h
  F:    kernel/freezer.c
  
 -FRONTSWAP API
 -M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 -L:    linux-kernel@vger.kernel.org
 -S:    Maintained
 -F:    include/linux/frontswap.h
 -F:    mm/frontswap.c
 -
  FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
  M:    David Howells <dhowells@redhat.com>
  L:    linux-cachefs@redhat.com (moderated for non-subscribers)
@@@ -8716,13 -8673,6 +8716,13 @@@ F:    Documentation/devicetree/bindings/po
  F:    drivers/base/power/domain*.c
  F:    include/linux/pm_domain.h
  
 +GENERIC PM DOMAIN PROVIDERS
 +M:    Ulf Hansson <ulf.hansson@linaro.org>
 +L:    linux-pm@vger.kernel.org
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
 +F:    drivers/genpd/
 +
  GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
  M:    Eugen Hristev <eugen.hristev@microchip.com>
  L:    linux-input@vger.kernel.org
@@@ -8774,7 -8724,7 +8774,7 @@@ F:      scripts/get_maintainer.p
  GFS2 FILE SYSTEM
  M:    Bob Peterson <rpeterso@redhat.com>
  M:    Andreas Gruenbacher <agruenba@redhat.com>
 -L:    cluster-devel@redhat.com
 +L:    gfs2@lists.linux.dev
  S:    Supported
  B:    https://bugzilla.kernel.org/enter_bug.cgi?product=File%20System&component=gfs2
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
@@@ -8819,15 -8769,6 +8819,15 @@@ S:    Supporte
  F:    Documentation/networking/device_drivers/ethernet/google/gve.rst
  F:    drivers/net/ethernet/google
  
 +GOOGLE FIRMWARE DRIVERS
 +M:    Tzung-Bi Shih <tzungbi@kernel.org>
 +R:    Brian Norris <briannorris@chromium.org>
 +R:    Julius Werner <jwerner@chromium.org>
 +L:    chrome-platform@lists.linux.dev
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
 +F:    drivers/firmware/google/
 +
  GPD POCKET FAN DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    platform-driver-x86@vger.kernel.org
@@@ -8871,7 -8812,6 +8871,7 @@@ R:      Michael Walle <michael@walle.cc
  S:    Maintained
  F:    drivers/gpio/gpio-regmap.c
  F:    include/linux/gpio/regmap.h
 +K:    (devm_)?gpio_regmap_(un)?register
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
@@@ -9365,7 -9305,7 +9365,7 @@@ F:      drivers/crypto/hisilicon/hpre/hpre_c
  F:    drivers/crypto/hisilicon/hpre/hpre_main.c
  
  HISILICON HNS3 PMU DRIVER
 -M:    Guangbin Huang <huangguangbin2@huawei.com>
 +M:    Jijie Shao <shaojijie@huawei.com>
  S:    Supported
  F:    Documentation/admin-guide/perf/hns3-pmu.rst
  F:    drivers/perf/hisilicon/hns3_pmu.c
@@@ -9378,13 -9318,6 +9378,13 @@@ W:    https://www.hisilicon.co
  F:    Documentation/devicetree/bindings/i2c/hisilicon,ascend910-i2c.yaml
  F:    drivers/i2c/busses/i2c-hisi.c
  
 +HISILICON KUNPENG SOC HCCS DRIVER
 +M:    Huisong Li <lihuisong@huawei.com>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs
 +F:    drivers/soc/hisilicon/kunpeng_hccs.c
 +F:    drivers/soc/hisilicon/kunpeng_hccs.h
 +
  HISILICON LPC BUS DRIVER
  M:    Jay Fang <f.fangjian@huawei.com>
  S:    Maintained
@@@ -9410,7 -9343,7 +9410,7 @@@ F:      Documentation/devicetree/bindings/ne
  F:    drivers/net/ethernet/hisilicon/
  
  HISILICON PMU DRIVER
 -M:    Shaokun Zhang <zhangshaokun@hisilicon.com>
 +M:    Yicong Yang <yangyicong@hisilicon.com>
  M:    Jonathan Cameron <jonathan.cameron@huawei.com>
  S:    Supported
  W:    http://www.hisilicon.com
@@@ -9442,6 -9375,7 +9442,6 @@@ F:      drivers/crypto/hisilicon/sgl.
  F:    include/linux/hisi_acc_qm.h
  
  HISILICON ROCE DRIVER
 -M:    Haoyue Xu <xuhaoyue1@hisilicon.com>
  M:    Junxian Huang <huangjunxian6@hisilicon.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
@@@ -9530,12 -9464,6 +9530,12 @@@ S:    Obsolet
  W:    http://w1.fi/hostap-driver.html
  F:    drivers/net/wireless/intersil/hostap/
  
 +HP BIOSCFG DRIVER
 +M:    Jorge Lopez <jorge.lopez2@hp.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/hp/hp-bioscfg/
 +
  HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
  L:    platform-driver-x86@vger.kernel.org
  S:    Orphan
@@@ -9567,12 -9495,6 +9567,12 @@@ S:    Maintaine
  W:    http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
  F:    fs/hpfs/
  
 +HS3001 Hardware Temperature and Humidity Sensor
 +M:    Andre Werner <andre.werner@systec-electronic.com>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hwmon/hs3001.c
 +
  HSI SUBSYSTEM
  M:    Sebastian Reichel <sre@kernel.org>
  S:    Maintained
@@@ -9676,7 -9598,7 +9676,7 @@@ S:      Maintaine
  F:    arch/x86/kernel/cpu/hygon.c
  
  HYNIX HI556 SENSOR DRIVER
 -M:    Shawn Tu <shawnx.tu@intel.com>
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -9689,7 -9611,7 +9689,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/hi846.c
  
  HYNIX HI847 SENSOR DRIVER
 -M:    Shawn Tu <shawnx.tu@intel.com>
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/hi847.c
@@@ -9760,14 -9682,6 +9760,14 @@@ L:    linux-acpi@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/i2c-core-acpi.c
  
 +I2C ADDRESS TRANSLATOR (ATR)
 +M:    Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
 +R:    Luca Ceresoli <luca.ceresoli@bootlin.com>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/i2c-atr.c
 +F:    include/linux/i2c-atr.h
 +
  I2C CONTROLLER DRIVER FOR NVIDIA GPU
  M:    Ajay Gupta <ajayg@nvidia.com>
  L:    linux-i2c@vger.kernel.org
@@@ -10824,7 -10738,6 +10824,7 @@@ INTEL TPMI DRIVE
  M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 +F:    Documentation/ABI/testing/debugfs-tpmi
  F:    drivers/platform/x86/intel/tpmi.c
  F:    include/linux/intel_tpmi.h
  
@@@ -11009,6 -10922,7 +11009,6 @@@ F:   include/linux/io_uring_types.
  F:    include/trace/events/io_uring.h
  F:    include/uapi/linux/io_uring.h
  F:    io_uring/
 -F:    tools/io_uring/
  
  IPMI SUBSYSTEM
  M:    Corey Minyard <minyard@acm.org>
@@@ -11382,7 -11296,6 +11382,7 @@@ F:   scripts/dummy-tools
  F:    scripts/mk*
  F:    scripts/mod/
  F:    scripts/package/
 +F:    usr/
  
  KERNEL HARDENING (not covered by other areas)
  M:    Kees Cook <keescook@chromium.org>
@@@ -11471,8 -11384,6 +11471,8 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/dev-tools/kunit/
  F:    include/kunit/
  F:    lib/kunit/
 +F:    rust/kernel/kunit.rs
 +F:    scripts/rustdoc_test_*
  F:    tools/testing/kunit/
  
  KERNEL USERMODE HELPER
@@@ -11589,8 -11500,6 +11589,8 @@@ F:   arch/x86/include/uapi/asm/svm.
  F:    arch/x86/include/uapi/asm/vmx.h
  F:    arch/x86/kvm/
  F:    arch/x86/kvm/*/
 +F:    tools/testing/selftests/kvm/*/x86_64/
 +F:    tools/testing/selftests/kvm/x86_64/
  
  KERNFS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@@ -12334,8 -12243,8 +12334,8 @@@ R:   WANG Xuerui <kernel@xen0n.name
  L:    loongarch@lists.linux.dev
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
 -F:    Documentation/loongarch/
 -F:    Documentation/translations/zh_CN/loongarch/
 +F:    Documentation/arch/loongarch/
 +F:    Documentation/translations/zh_CN/arch/loongarch/
  F:    arch/loongarch/
  F:    drivers/*/*loongarch*
  
@@@ -12361,16 -12270,6 +12361,16 @@@ F: Documentation/devicetree/bindings/cl
  F:    drivers/clk/clk-loongson2.c
  F:    include/dt-bindings/clock/loongson,ls2k-clk.h
  
 +LOONGSON SPI DRIVER
 +M:    Yinbo Zhu <zhuyinbo@loongson.cn>
 +L:    linux-spi@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/loongson,ls2k-spi.yaml
 +F:    drivers/spi/spi-loongson-core.c
 +F:    drivers/spi/spi-loongson-pci.c
 +F:    drivers/spi/spi-loongson-plat.c
 +F:    drivers/spi/spi-loongson.h
 +
  LOONGSON-2 SOC SERIES GUTS DRIVER
  M:    Yinbo Zhu <zhuyinbo@loongson.cn>
  L:    loongarch@lists.linux.dev
@@@ -12378,13 -12277,6 +12378,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/hwinfo/loongson,ls2k-chipid.yaml
  F:    drivers/soc/loongson/loongson2_guts.c
  
 +LOONGSON-2 SOC SERIES PM DRIVER
 +M:    Yinbo Zhu <zhuyinbo@loongson.cn>
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/soc/loongson/loongson,ls2k-pmc.yaml
 +F:    drivers/soc/loongson/loongson2_pm.c
 +
  LOONGSON-2 SOC SERIES PINCTRL DRIVER
  M:    zhanghongchen <zhanghongchen@loongson.cn>
  M:    Yinbo Zhu <zhuyinbo@loongson.cn>
@@@ -12393,14 -12285,6 +12393,14 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
  F:    drivers/pinctrl/pinctrl-loongson2.c
  
 +LOONGSON-2 SOC SERIES THERMAL DRIVER
 +M:    zhanghongchen <zhanghongchen@loongson.cn>
 +M:    Yinbo Zhu <zhuyinbo@loongson.cn>
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml
 +F:    drivers/thermal/loongson2_thermal.c
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <sathya.prakash@broadcom.com>
  M:    Sreekanth Reddy <sreekanth.reddy@broadcom.com>
@@@ -12596,7 -12480,6 +12596,7 @@@ F:   net/mctp
  
  MAPLE TREE
  M:    Liam R. Howlett <Liam.Howlett@oracle.com>
 +L:    maple-tree@lists.infradead.org
  L:    linux-mm@kvack.org
  S:    Supported
  F:    Documentation/core-api/maple_tree.rst
@@@ -12942,7 -12825,7 +12942,7 @@@ F:   drivers/power/supply/max77976_charge
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
  M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    linux-pm@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  B:    mailto:linux-samsung-soc@vger.kernel.org
  F:    Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml
@@@ -12953,7 -12836,7 +12953,7 @@@ MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS 
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    linux-kernel@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  B:    mailto:linux-samsung-soc@vger.kernel.org
  F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
@@@ -13121,21 -13004,17 +13121,21 @@@ F:        drivers/staging/media/imx
  F:    include/linux/imx-media.h
  F:    include/media/imx.h
  
 -MEDIA DRIVERS FOR FREESCALE IMX7
 +MEDIA DRIVERS FOR FREESCALE IMX7/8
  M:    Rui Miguel Silva <rmfrfs@gmail.com>
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +M:    Martin Kepplinger <martin.kepplinger@puri.sm>
 +R:    Purism Kernel Team <kernel@puri.sm>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/admin-guide/media/imx7.rst
  F:    Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
  F:    Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
 +F:    Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml
  F:    drivers/media/platform/nxp/imx-mipi-csis.c
  F:    drivers/media/platform/nxp/imx7-media-csi.c
 +F:    drivers/media/platform/nxp/imx8mq-mipi-csi2.c
  
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <aospan@netup.ru>
@@@ -13367,7 -13246,6 +13367,7 @@@ L:   linux-mediatek@lists.infradead.org (
  S:    Supported
  F:    Documentation/devicetree/bindings/iommu/mediatek*
  F:    drivers/iommu/mtk_iommu*
 +F:    include/dt-bindings/memory/mediatek,mt*-port.h
  F:    include/dt-bindings/memory/mt*-port.h
  
  MEDIATEK JPEG DRIVER
@@@ -13745,7 -13623,6 +13745,7 @@@ F:   include/linux/memory_hotplug.
  F:    include/linux/mm.h
  F:    include/linux/mmzone.h
  F:    include/linux/pagewalk.h
 +F:    include/linux/rmap.h
  F:    include/trace/events/ksm.h
  F:    mm/
  F:    tools/mm/
@@@ -13909,7 -13786,7 +13909,7 @@@ F:   Documentation/devicetree/bindings/se
  F:    drivers/spi/spi-at91-usart.c
  
  MICROCHIP AUDIO ASOC DRIVERS
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/sound/atmel*
@@@ -13932,7 -13809,7 +13932,7 @@@ S:   Maintaine
  F:    drivers/crypto/atmel-ecc.*
  
  MICROCHIP EIC DRIVER
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/interrupt-controller/microchip,sama7g5-eic.yaml
@@@ -14005,7 -13882,7 +14005,7 @@@ F:   drivers/video/fbdev/atmel_lcdfb.
  F:    include/video/atmel_lcdc.h
  
  MICROCHIP MCP16502 PMIC DRIVER
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
@@@ -14032,7 -13909,7 +14032,7 @@@ F:   Documentation/devicetree/bindings/mt
  F:    drivers/mtd/nand/raw/atmel/*
  
  MICROCHIP OTPC DRIVER
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/nvmem/microchip,sama7g5-otpc.yaml
@@@ -14040,14 -13917,12 +14040,14 @@@ F:        drivers/nvmem/microchip-otpc.
  F:    include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
  
  MICROCHIP PCI1XXXX GP DRIVER
 +M:    Vaibhaav Ram T.L <vaibhaavram.tl@microchip.com>
  M:    Kumaravel Thiagarajan <kumaravel.thiagarajan@microchip.com>
  L:    linux-gpio@vger.kernel.org
  S:    Supported
  F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
  F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h
  F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
 +F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
  
  MICROCHIP PCI1XXXX I2C DRIVER
  M:    Tharun Kumar P <tharunkumar.pasumarthi@microchip.com>
@@@ -14073,7 -13948,7 +14073,7 @@@ F:   Documentation/devicetree/bindings/fp
  F:    drivers/fpga/microchip-spi.c
  
  MICROCHIP PWM DRIVER
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-pwm@vger.kernel.org
  S:    Supported
@@@ -14089,7 -13964,7 +14089,7 @@@ F:   drivers/iio/adc/at91-sama5d2_adc.
  F:    include/dt-bindings/iio/adc/at91-sama5d2_adc.h
  
  MICROCHIP SAMA5D2-COMPATIBLE SHUTDOWN CONTROLLER
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  S:    Supported
  F:    Documentation/devicetree/bindings/power/reset/atmel,sama5d2-shdwc.yaml
  F:    drivers/power/reset/at91-sama5d2_shdwc.c
@@@ -14106,7 -13981,7 +14106,7 @@@ S:   Supporte
  F:    drivers/spi/spi-atmel.*
  
  MICROCHIP SSC DRIVER
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/misc/atmel-ssc.txt
@@@ -14135,7 -14010,7 +14135,7 @@@ F:   drivers/usb/gadget/udc/atmel_usba_ud
  
  MICROCHIP WILC1000 WIFI DRIVER
  M:    Ajay Singh <ajay.kathat@microchip.com>
 -M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@tuxon.dev>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  F:    drivers/net/wireless/microchip/wilc1000/
@@@ -14293,7 -14168,7 +14293,7 @@@ W:   http://www.linux-mips.org
  Q:    https://patchwork.kernel.org/project/linux-mips/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
  F:    Documentation/devicetree/bindings/mips/
 -F:    Documentation/mips/
 +F:    Documentation/arch/mips/
  F:    arch/mips/
  F:    drivers/platform/mips/
  F:    include/dt-bindings/mips/
@@@ -14764,7 -14639,7 +14764,7 @@@ F:   drivers/rtc/rtc-ntxec.
  F:    include/linux/mfd/ntxec.h
  
  NETRONOME ETHERNET DRIVERS
 -M:    Simon Horman <simon.horman@corigine.com>
 +M:    Louis Peens <louis.peens@corigine.com>
  R:    Jakub Kicinski <kuba@kernel.org>
  L:    oss-drivers@corigine.com
  S:    Maintained
@@@ -14927,16 -14802,6 +14927,16 @@@ F: net/netfilter/xt_CONNSECMARK.
  F:    net/netfilter/xt_SECMARK.c
  F:    net/netlabel/
  
 +NETWORKING [MACSEC]
 +M:    Sabrina Dubroca <sd@queasysnail.net>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/macsec.c
 +F:    include/net/macsec.h
 +F:    include/uapi/linux/if_macsec.h
 +K:    macsec
 +K:    \bmdo_
 +
  NETWORKING [MPTCP]
  M:    Matthieu Baerts <matthieu.baerts@tessares.net>
  M:    Mat Martineau <martineau@kernel.org>
@@@ -14959,6 -14824,7 +14959,6 @@@ NETWORKING [TCP
  M:    Eric Dumazet <edumazet@google.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    include/linux/net_mm.h
  F:    include/linux/tcp.h
  F:    include/net/tcp.h
  F:    include/trace/events/tcp.h
@@@ -15121,7 -14987,6 +15121,7 @@@ F:   include/linux/power/bq27xxx_battery.
  
  NOLIBC HEADER FILE
  M:    Willy Tarreau <w@1wt.eu>
 +M:    Thomas Weißschuh <linux@weissschuh.net>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
  F:    tools/include/nolibc/
@@@ -15648,7 -15513,6 +15648,7 @@@ W:   http://www.muru.com/linux/omap
  W:    http://linux.omap.com/
  Q:    http://patchwork.kernel.org/project/linux-omap/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 +F:    Documentation/devicetree/bindings/arm/ti/omap.yaml
  F:    arch/arm/configs/omap2plus_defconfig
  F:    arch/arm/mach-omap2/
  F:    drivers/bus/ti-sysc.c
@@@ -15685,7 -15549,7 +15685,7 @@@ F:   Documentation/filesystems/omfs.rs
  F:    fs/omfs/
  
  OMNIVISION OG01A1B SENSOR DRIVER
 -M:    Shawn Tu <shawnx.tu@intel.com>
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/og01a1b.c
@@@ -15698,8 -15562,9 +15698,8 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/i2c/ov01a10.c
  
  OMNIVISION OV02A10 SENSOR DRIVER
 -M:    Dongchun Zhu <dongchun.zhu@mediatek.com>
  L:    linux-media@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/ovti,ov02a10.yaml
  F:    drivers/media/i2c/ov02a10.c
@@@ -15734,7 -15599,6 +15734,7 @@@ F:   drivers/media/i2c/ov13b10.
  
  OMNIVISION OV2680 SENSOR DRIVER
  M:    Rui Miguel Silva <rmfrfs@gmail.com>
 +M:    Hans de Goede <hansg@kernel.org>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -15751,7 -15615,7 +15751,7 @@@ F:   drivers/media/i2c/ov2685.
  
  OMNIVISION OV2740 SENSOR DRIVER
  M:    Tianshu Qiu <tian.shu.qiu@intel.com>
 -R:    Shawn Tu <shawnx.tu@intel.com>
 +R:    Sakari Ailus <sakari.ailus@linux.intel.com>
  R:    Bingbu Cao <bingbu.cao@intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
@@@ -15783,7 -15647,7 +15783,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ov5647.c
  
  OMNIVISION OV5670 SENSOR DRIVER
 -M:    Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -15791,7 -15655,7 +15791,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ov5670.c
  
  OMNIVISION OV5675 SENSOR DRIVER
 -M:    Shawn Tu <shawnx.tu@intel.com>
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -15830,8 -15694,9 +15830,8 @@@ F:   drivers/media/i2c/ov772x.
  F:    include/media/i2c/ov772x.h
  
  OMNIVISION OV7740 SENSOR DRIVER
 -M:    Wenyou Yang <wenyou.yang@microchip.com>
  L:    linux-media@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/ov7740.txt
  F:    drivers/media/i2c/ov7740.c
@@@ -16136,7 -16001,7 +16136,7 @@@ M:   Ilias Apalodimas <ilias.apalodimas@l
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/networking/page_pool.rst
 -F:    include/net/page_pool.h
 +F:    include/net/page_pool/
  F:    include/trace/events/page_pool.h
  F:    net/core/page_pool.c
  
@@@ -16428,7 -16293,6 +16428,7 @@@ F:   drivers/pci/controller/dwc/pci-exyno
  PCI DRIVER FOR SYNOPSYS DESIGNWARE
  M:    Jingoo Han <jingoohan1@gmail.com>
  M:    Gustavo Pimentel <gustavo.pimentel@synopsys.com>
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
@@@ -16763,6 -16627,8 +16763,8 @@@ L:   linux-kernel@vger.kernel.or
  S:    Supported
  W:    https://perf.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-tools
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf-tools-next
  F:    arch/*/events/*
  F:    arch/*/events/*/*
  F:    arch/*/include/asm/perf_event.h
@@@ -17165,7 -17031,7 +17167,7 @@@ L:   linuxpps@ml.enneenne.com (subscriber
  S:    Maintained
  W:    http://wiki.enneenne.com/index.php/LinuxPPS_support
  F:    Documentation/ABI/testing/sysfs-pps
 -F:    Documentation/devicetree/bindings/pps/pps-gpio.txt
 +F:    Documentation/devicetree/bindings/pps/pps-gpio.yaml
  F:    Documentation/driver-api/pps.rst
  F:    drivers/pps/
  F:    include/linux/pps*.h
@@@ -17181,16 -17047,15 +17183,16 @@@ F:        drivers/net/ppp/pptp.
  PRESSURE STALL INFORMATION (PSI)
  M:    Johannes Weiner <hannes@cmpxchg.org>
  M:    Suren Baghdasaryan <surenb@google.com>
 +R:    Peter Ziljstra <peterz@infradead.org>
  S:    Maintained
  F:    include/linux/psi*
  F:    kernel/sched/psi.c
  
  PRINTK
  M:    Petr Mladek <pmladek@suse.com>
 -M:    Sergey Senozhatsky <senozhatsky@chromium.org>
  R:    Steven Rostedt <rostedt@goodmis.org>
  R:    John Ogness <john.ogness@linutronix.de>
 +R:    Sergey Senozhatsky <senozhatsky@chromium.org>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git
  F:    include/linux/printk.h
@@@ -17289,13 -17154,6 +17291,13 @@@ F: drivers/ptp/
  F:    include/linux/ptp_cl*
  K:    (?:\b|_)ptp(?:\b|_)
  
 +PTP MOCKUP CLOCK SUPPORT
 +M:    Vladimir Oltean <vladimir.oltean@nxp.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/ptp/ptp_mock.c
 +F:    include/linux/ptp_mock.h
 +
  PTP VIRTUAL CLOCK SUPPORT
  M:    Yangbo Lu <yangbo.lu@nxp.com>
  L:    netdev@vger.kernel.org
@@@ -17670,7 -17528,7 +17672,7 @@@ L:   linux-pm@vger.kernel.or
  L:    linux-arm-msm@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
 -F:    drivers/soc/qcom/cpr.c
 +F:    drivers/genpd/qcom/cpr.c
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
  M:    Ilia Lin <ilia.lin@kernel.org>
@@@ -18084,6 -17942,7 +18086,6 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/admin-guide/rtc.rst
  F:    Documentation/devicetree/bindings/rtc/
  F:    drivers/rtc/
 -F:    include/linux/platform_data/rtc-*
  F:    include/linux/rtc.h
  F:    include/linux/rtc/
  F:    include/uapi/linux/rtc.h
@@@ -18153,7 -18012,7 +18155,7 @@@ F:   include/linux/regmap.
  
  REISERFS FILE SYSTEM
  L:    reiserfs-devel@vger.kernel.org
 -S:    Supported
 +S:    Obsolete
  F:    fs/reiserfs/
  
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
@@@ -18651,14 -18510,17 +18653,14 @@@ RTL8180 WIRELESS DRIVE
  L:    linux-wireless@vger.kernel.org
  S:    Orphan
  W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
 -M:    Herton Ronaldo Krzesinski <herton@canonical.com>
 -M:    Hin-Tak Leung <htl10@users.sourceforge.net>
 +M:    Hin-Tak Leung <hintak.leung@gmail.com>
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
@@@ -18694,8 -18556,6 +18696,8 @@@ R:   Boqun Feng <boqun.feng@gmail.com
  R:    Gary Guo <gary@garyguo.net>
  R:    Björn Roy Baron <bjorn3_gh@protonmail.com>
  R:    Benno Lossin <benno.lossin@proton.me>
 +R:    Andreas Hindborg <a.hindborg@samsung.com>
 +R:    Alice Ryhl <aliceryhl@google.com>
  L:    rust-for-linux@vger.kernel.org
  S:    Supported
  W:    https://github.com/Rust-for-Linux/linux
@@@ -18737,7 -18597,7 +18739,7 @@@ L:   linux-s390@vger.kernel.or
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
  F:    Documentation/driver-api/s390-drivers.rst
 -F:    Documentation/s390/
 +F:    Documentation/arch/s390/
  F:    arch/s390/
  F:    drivers/s390/
  F:    drivers/watchdog/diag288_wdt.c
@@@ -18798,7 -18658,7 +18800,7 @@@ M:   Niklas Schnelle <schnelle@linux.ibm.
  M:    Gerald Schaefer <gerald.schaefer@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
 -F:    Documentation/s390/pci.rst
 +F:    Documentation/arch/s390/pci.rst
  F:    arch/s390/pci/
  F:    drivers/pci/hotplug/s390_pci_hpc.c
  
@@@ -18815,7 -18675,7 +18817,7 @@@ M:   Halil Pasic <pasic@linux.ibm.com
  M:    Jason Herne <jjherne@linux.ibm.com>
  L:    linux-s390@vger.kernel.org
  S:    Supported
 -F:    Documentation/s390/vfio-ap*
 +F:    Documentation/arch/s390/vfio-ap*
  F:    drivers/s390/crypto/vfio_ap*
  
  S390 VFIO-CCW DRIVER
@@@ -18825,7 -18685,7 +18827,7 @@@ R:   Halil Pasic <pasic@linux.ibm.com
  L:    linux-s390@vger.kernel.org
  L:    kvm@vger.kernel.org
  S:    Supported
 -F:    Documentation/s390/vfio-ccw.rst
 +F:    Documentation/arch/s390/vfio-ccw.rst
  F:    drivers/s390/cio/vfio_ccw*
  F:    include/uapi/linux/vfio_ccw.h
  
@@@ -18931,7 -18791,7 +18933,7 @@@ SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVE
  M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
  L:    linux-kernel@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  B:    mailto:linux-samsung-soc@vger.kernel.org
  F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
  F:    Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
@@@ -19003,7 -18863,7 +19005,7 @@@ M:   Tomasz Figa <tomasz.figa@gmail.com
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  R:    Alim Akhtar <alim.akhtar@samsung.com>
  L:    linux-samsung-soc@vger.kernel.org
 -S:    Supported
 +S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
  F:    Documentation/devicetree/bindings/clock/samsung,*.yaml
@@@ -19367,6 -19227,13 +19369,6 @@@ F:  Documentation/devicetree/bindings/se
  F:    drivers/tty/serdev/
  F:    include/linux/serdev.h
  
 -SERIAL DRIVERS
 -M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -L:    linux-serial@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/serial/
 -F:    drivers/tty/serial/
 -
  SERIAL IR RECEIVER
  M:    Sean Young <sean@mess.org>
  L:    linux-media@vger.kernel.org
@@@ -19418,6 -19285,7 +19420,6 @@@ F:   drivers/misc/sgi-gru
  SGI XP/XPC/XPNET DRIVER
  M:    Robin Holt <robinmholt@gmail.com>
  M:    Steve Wahl <steve.wahl@hpe.com>
 -R:    Mike Travis <mike.travis@hpe.com>
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
@@@ -19536,32 -19404,6 +19538,32 @@@ F: drivers/media/mmc/siano
  F:    drivers/media/usb/siano/
  F:    drivers/media/usb/siano/
  
 +SIEMENS IPC LED DRIVERS
 +M:    Gerd Haeussler <gerd.haeussler.ext@siemens.com>
 +M:    Xing Tong Wu <xingtong.wu@siemens.com>
 +M:    Tobias Schaffner <tobias.schaffner@siemens.com>
 +L:    linux-leds@vger.kernel.org
 +S:    Maintained
 +F:    drivers/leds/simple/
 +
 +SIEMENS IPC PLATFORM DRIVERS
 +M:    Gerd Haeussler <gerd.haeussler.ext@siemens.com>
 +M:    Xing Tong Wu <xingtong.wu@siemens.com>
 +M:    Tobias Schaffner <tobias.schaffner@siemens.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/siemens/
 +F:    include/linux/platform_data/x86/simatic-ipc-base.h
 +F:    include/linux/platform_data/x86/simatic-ipc.h
 +
 +SIEMENS IPC WATCHDOG DRIVERS
 +M:    Gerd Haeussler <gerd.haeussler.ext@siemens.com>
 +M:    Xing Tong Wu <xingtong.wu@siemens.com>
 +M:    Tobias Schaffner <tobias.schaffner@siemens.com>
 +L:    linux-watchdog@vger.kernel.org
 +S:    Maintained
 +F:    drivers/watchdog/simatic-ipc-wdt.c
 +
  SIFIVE DRIVERS
  M:    Palmer Dabbelt <palmer@dabbelt.com>
  M:    Paul Walmsley <paul.walmsley@sifive.com>
@@@ -19754,6 -19596,13 +19756,6 @@@ M:  Nicolas Pitre <nico@fluxnic.net
  S:    Odd Fixes
  F:    drivers/net/ethernet/smsc/smc91x.*
  
 -SMM665 HARDWARE MONITOR DRIVER
 -M:    Guenter Roeck <linux@roeck-us.net>
 -L:    linux-hwmon@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/hwmon/smm665.rst
 -F:    drivers/hwmon/smm665.c
 -
  SMSC EMC2103 HARDWARE MONITOR DRIVER
  M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    linux-hwmon@vger.kernel.org
@@@ -20406,13 -20255,6 +20408,13 @@@ S: Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  F:    drivers/staging/
  
 +STANDALONE CACHE CONTROLLER DRIVERS
 +M:    Conor Dooley <conor@kernel.org>
 +L:    linux-riscv@lists.infradead.org
 +S:    Maintained
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 +F:    drivers/cache
 +
  STARFIRE/DURALAN NETWORK DRIVER
  M:    Ion Badulescu <ionut@badula.org>
  S:    Odd Fixes
@@@ -20437,31 -20279,12 +20439,31 @@@ S:        Maintaine
  F:    Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
  
 +STARFIVE JH7110 DPHY RX DRIVER
 +M:    Jack Zhu <jack.zhu@starfivetech.com>
 +M:    Changhuang Liang <changhuang.liang@starfivetech.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/phy/starfive,jh7110-dphy-rx.yaml
 +F:    drivers/phy/starfive/phy-jh7110-dphy-rx.c
 +
  STARFIVE JH7110 MMC/SD/SDIO DRIVER
  M:    William Qiu <william.qiu@starfivetech.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/mmc/starfive*
  F:    drivers/mmc/host/dw_mmc-starfive.c
  
 +STARFIVE JH7110 PLL CLOCK DRIVER
 +M:    Xingyu Wu <xingyu.wu@starfivetech.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/clock/starfive,jh7110-pll.yaml
 +F:    drivers/clk/starfive/clk-starfive-jh7110-pll.c
 +
 +STARFIVE JH7110 SYSCON
 +M:    William Qiu <william.qiu@starfivetech.com>
 +M:    Xingyu Wu <xingyu.wu@starfivetech.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml
 +
  STARFIVE JH7110 TDM DRIVER
  M:    Walker Chen <walker.chen@starfivetech.com>
  S:    Maintained
@@@ -20504,14 -20327,13 +20506,14 @@@ STARFIVE JH71XX PMU CONTROLLER DRIVE
  M:    Walker Chen <walker.chen@starfivetech.com>
  S:    Supported
  F:    Documentation/devicetree/bindings/power/starfive*
 -F:    drivers/soc/starfive/jh71xx_pmu.c
 +F:    drivers/genpd/starfive/jh71xx-pmu.c
  F:    include/dt-bindings/power/starfive,jh7110-pmu.h
  
  STARFIVE SOC DRIVERS
  M:    Conor Dooley <conor@kernel.org>
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 +F:    Documentation/devicetree/bindings/soc/starfive/
  F:    drivers/soc/starfive/
  
  STARFIVE TRNG DRIVER
@@@ -20527,14 -20349,6 +20529,14 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/watchdog/starfive*
  F:    drivers/watchdog/starfive-wdt.c
  
 +STARFIVE JH71X0 PCIE AND USB PHY DRIVER
 +M:    Minda Chen <minda.chen@starfivetech.com>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/phy/starfive,jh7110-pcie-phy.yaml
 +F:    Documentation/devicetree/bindings/phy/starfive,jh7110-usb-phy.yaml
 +F:    drivers/phy/starfive/phy-jh7110-pcie.c
 +F:    drivers/phy/starfive/phy-jh7110-usb.c
 +
  STATIC BRANCH/CALL
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Josh Poimboeuf <jpoimboe@kernel.org>
@@@ -21248,39 -21062,6 +21250,39 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
  F:    sound/soc/ti/
  
 +TEXAS INSTRUMENTS AUDIO (ASoC/HDA) DRIVERS
 +M:    Shenghao Ding <shenghao-ding@ti.com>
 +M:    Kevin Lu <kevin-lu@ti.com>
 +M:    Baojun Xu <baojun.xu@ti.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/tas2552.txt
 +F:    Documentation/devicetree/bindings/sound/tas2562.yaml
 +F:    Documentation/devicetree/bindings/sound/tas2770.yaml
 +F:    Documentation/devicetree/bindings/sound/tas27xx.yaml
 +F:    Documentation/devicetree/bindings/sound/ti,pcm1681.txt
 +F:    Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml
 +F:    Documentation/devicetree/bindings/sound/ti,tlv320*.yaml
 +F:    Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
 +F:    Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
 +F:    Documentation/devicetree/bindings/sound/tpa6130a2.txt
 +F:    include/sound/tas2*.h
 +F:    include/sound/tlv320*.h
 +F:    include/sound/tpa6130a2-plat.h
 +F:    sound/pci/hda/tas2781_hda_i2c.c
 +F:    sound/soc/codecs/pcm1681.c
 +F:    sound/soc/codecs/pcm1789*.*
 +F:    sound/soc/codecs/pcm179x*.*
 +F:    sound/soc/codecs/pcm186x*.*
 +F:    sound/soc/codecs/pcm3008.*
 +F:    sound/soc/codecs/pcm3060*.*
 +F:    sound/soc/codecs/pcm3168a*.*
 +F:    sound/soc/codecs/pcm5102a.c
 +F:    sound/soc/codecs/pcm512x*.*
 +F:    sound/soc/codecs/tas2*.*
 +F:    sound/soc/codecs/tlv320*.*
 +F:    sound/soc/codecs/tpa6130a2.*
 +
  TEXAS INSTRUMENTS DMA DRIVERS
  M:    Peter Ujfalusi <peter.ujfalusi@gmail.com>
  L:    dmaengine@vger.kernel.org
@@@ -21329,7 -21110,7 +21331,7 @@@ F:   drivers/irqchip/irq-ti-sci-inta.
  F:    drivers/irqchip/irq-ti-sci-intr.c
  F:    drivers/reset/reset-ti-sci.c
  F:    drivers/soc/ti/ti_sci_inta_msi.c
 -F:    drivers/soc/ti/ti_sci_pm_domains.c
 +F:    drivers/genpd/ti/ti_sci_pm_domains.c
  F:    include/dt-bindings/soc/ti,sci_pm_domain.h
  F:    include/linux/soc/ti/ti_sci_inta_msi.h
  F:    include/linux/soc/ti/ti_sci_protocol.h
@@@ -21556,14 -21337,6 +21558,14 @@@ F: drivers/misc/tifm
  F:    drivers/mmc/host/tifm_sd.c
  F:    include/linux/tifm.h
  
 +TI FPD-LINK DRIVERS
 +M:    Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/ti,ds90*
 +F:    drivers/media/i2c/ds90*
 +F:    include/media/i2c/ds90*
 +
  TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
  M:    Nishanth Menon <nm@ti.com>
  M:    Santosh Shilimkar <ssantosh@kernel.org>
@@@ -21571,7 -21344,6 +21573,7 @@@ L:   linux-kernel@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
 +F:    drivers/genpd/ti/omap_prm.c
  F:    drivers/soc/ti/*
  
  TI LM49xxx FAMILY ASoC CODEC DRIVERS
@@@ -21814,20 -21586,6 +21816,20 @@@ S: Maintaine
  F:    Documentation/hwmon/tps546d24.rst
  F:    drivers/hwmon/pmbus/tps546d24.c
  
 +TQ SYSTEMS BOARD & DRIVER SUPPORT
 +L:    linux@ew.tq-group.com
 +S:    Supported
 +W:    https://www.tq-group.com/en/products/tq-embedded/
 +F:    arch/arm/boot/dts/imx*mba*.dts*
 +F:    arch/arm/boot/dts/imx*tqma*.dts*
 +F:    arch/arm/boot/dts/mba*.dtsi
 +F:    arch/arm64/boot/dts/freescale/imx*mba*.dts*
 +F:    arch/arm64/boot/dts/freescale/imx*tqma*.dts*
 +F:    arch/arm64/boot/dts/freescale/mba*.dtsi
 +F:    drivers/gpio/gpio-tqmx86.c
 +F:    drivers/mfd/tqmx86.c
 +F:    drivers/watchdog/tqmx86_wdt.c
 +
  TRACING
  M:    Steven Rostedt <rostedt@goodmis.org>
  M:    Masami Hiramatsu <mhiramat@kernel.org>
@@@ -21873,22 -21631,27 +21875,22 @@@ F:        kernel/trace/trace_osnoise.
  F:    kernel/trace/trace_sched_wakeup.c
  
  TRADITIONAL CHINESE DOCUMENTATION
 -M:    Hu Haowen <src.res@email.cn>
 -L:    linux-doc-tw-discuss@lists.sourceforge.net (moderated for non-subscribers)
 +M:    Hu Haowen <src.res.211@gmail.com>
  S:    Maintained
  W:    https://github.com/srcres258/linux-doc
  T:    git git://github.com/srcres258/linux-doc.git doc-zh-tw
  F:    Documentation/translations/zh_TW/
  
 -TTY LAYER
 +TTY LAYER AND SERIAL DRIVERS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  M:    Jiri Slaby <jirislaby@kernel.org>
  L:    linux-kernel@vger.kernel.org
  L:    linux-serial@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
 +F:    Documentation/devicetree/bindings/serial/
  F:    Documentation/driver-api/serial/
  F:    drivers/tty/
 -F:    drivers/tty/serial/serial_base.h
 -F:    drivers/tty/serial/serial_base_bus.c
 -F:    drivers/tty/serial/serial_core.c
 -F:    drivers/tty/serial/serial_ctrl.c
 -F:    drivers/tty/serial/serial_port.c
  F:    include/linux/selection.h
  F:    include/linux/serial.h
  F:    include/linux/serial_core.h
@@@ -22037,7 -21800,7 +22039,7 @@@ F:   Documentation/admin-guide/ufs.rs
  F:    fs/ufs/
  
  UHID USERSPACE HID IO DRIVER
 -M:    David Rheinsberg <david.rheinsberg@gmail.com>
 +M:    David Rheinsberg <david@readahead.eu>
  L:    linux-input@vger.kernel.org
  S:    Maintained
  F:    drivers/hid/uhid.c
@@@ -22522,39 -22285,6 +22524,39 @@@ L: linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    drivers/clk/ux500/
  
 +V4L2 ASYNC AND FWNODE FRAMEWORKS
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    drivers/media/v4l2-core/v4l2-async.c
 +F:    drivers/media/v4l2-core/v4l2-fwnode.c
 +F:    include/media/v4l2-async.h
 +F:    include/media/v4l2-fwnode.h
 +
 +V4L2 LENS DRIVERS
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    drivers/media/i2c/ak*
 +F:    drivers/media/i2c/dw*
 +F:    drivers/media/i2c/lm*
 +
 +V4L2 CAMERA SENSOR DRIVERS
 +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/driver-api/media/camera-sensor.rst
 +F:    Documentation/driver-api/media/tx-rx.rst
 +F:    drivers/media/i2c/ar*
 +F:    drivers/media/i2c/hi*
 +F:    drivers/media/i2c/imx*
 +F:    drivers/media/i2c/mt*
 +F:    drivers/media/i2c/og*
 +F:    drivers/media/i2c/ov*
 +F:    drivers/media/i2c/s5*
 +F:    drivers/media/i2c/st-vgxy61.c
 +
  VF610 NAND DRIVER
  M:    Stefan Agner <stefan@agner.ch>
  L:    linux-mtd@lists.infradead.org
@@@ -22625,13 -22355,6 +22627,13 @@@ S: Maintaine
  P:    Documentation/driver-api/vfio-pci-device-specific-driver-acceptance.rst
  F:    drivers/vfio/pci/*/
  
 +VFIO PDS PCI DRIVER
 +M:    Brett Creeley <brett.creeley@amd.com>
 +L:    kvm@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/networking/device_drivers/ethernet/amd/pds_vfio_pci.rst
 +F:    drivers/vfio/pci/pds/
 +
  VFIO PLATFORM DRIVER
  M:    Eric Auger <eric.auger@redhat.com>
  L:    kvm@vger.kernel.org
@@@ -22755,6 -22478,7 +22757,6 @@@ L:   virtualization@lists.linux-foundatio
  S:    Maintained
  F:    drivers/block/virtio_blk.c
  F:    drivers/scsi/virtio_scsi.c
 -F:    drivers/vhost/scsi.c
  F:    include/uapi/linux/virtio_blk.h
  F:    include/uapi/linux/virtio_scsi.h
  
@@@ -22853,16 -22577,6 +22855,16 @@@ F: include/linux/vhost_iotlb.
  F:    include/uapi/linux/vhost.h
  F:    kernel/vhost_task.c
  
 +VIRTIO HOST (VHOST-SCSI)
 +M:    "Michael S. Tsirkin" <mst@redhat.com>
 +M:    Jason Wang <jasowang@redhat.com>
 +M:    Mike Christie <michael.christie@oracle.com>
 +R:    Paolo Bonzini <pbonzini@redhat.com>
 +R:    Stefan Hajnoczi <stefanha@redhat.com>
 +L:    virtualization@lists.linux-foundation.org
 +S:    Maintained
 +F:    drivers/vhost/scsi.c
 +
  VIRTIO I2C DRIVER
  M:    Conghui Chen <conghui.chen@intel.com>
  M:    Viresh Kumar <viresh.kumar@linaro.org>
@@@ -23104,9 -22818,9 +23106,9 @@@ F:   drivers/net/vrf.
  VSPRINTF
  M:    Petr Mladek <pmladek@suse.com>
  M:    Steven Rostedt <rostedt@goodmis.org>
 -M:    Sergey Senozhatsky <senozhatsky@chromium.org>
  R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  R:    Rasmus Villemoes <linux@rasmusvillemoes.dk>
 +R:    Sergey Senozhatsky <senozhatsky@chromium.org>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git
  F:    Documentation/core-api/printk-formats.rst
@@@ -23180,7 -22894,6 +23182,7 @@@ S:   Maintaine
  W:    https://www.net-swift.com
  F:    Documentation/networking/device_drivers/ethernet/wangxun/*
  F:    drivers/net/ethernet/wangxun/
 +F:    drivers/net/pcs/pcs-xpcs-wx.c
  
  WATCHDOG DEVICE DRIVERS
  M:    Wim Van Sebroeck <wim@linux-watchdog.org>
@@@ -23209,7 -22922,7 +23211,7 @@@ S:   Maintaine
  F:    drivers/rtc/rtc-sd3078.c
  
  WIIMOTE HID DRIVER
 -M:    David Rheinsberg <david.rheinsberg@gmail.com>
 +M:    David Rheinsberg <david@readahead.eu>
  L:    linux-input@vger.kernel.org
  S:    Maintained
  F:    drivers/hid/hid-wiimote*
@@@ -23255,10 -22968,8 +23257,10 @@@ S: Orpha
  F:    drivers/net/wireless/legacy/wl3501*
  
  WMI BINARY MOF DRIVER
 -L:    platform-drivers-x86@vger.kernel.org
 -S:    Orphan
 +M:    Armin Wolf <W_Armin@gmx.de>
 +R:    Thomas Weißschuh <linux@weissschuh.net>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
  F:    Documentation/ABI/stable/sysfs-platform-wmi-bmof
  F:    Documentation/wmi/devices/wmi-bmof.rst
  F:    drivers/platform/x86/wmi-bmof.c
@@@ -23433,8 -23144,7 +23435,8 @@@ F:   arch/x86/platfor
  
  X86 PLATFORM UV HPE SUPERDOME FLEX
  M:    Steve Wahl <steve.wahl@hpe.com>
 -R:    Mike Travis <mike.travis@hpe.com>
 +R:    Justin Ernst <justin.ernst@hpe.com>
 +R:    Kyle Meyer <kyle.meyer@hpe.com>
  R:    Dimitri Sivanich <dimitri.sivanich@hpe.com>
  R:    Russ Anderson <russ.anderson@hpe.com>
  S:    Supported
@@@ -23621,14 -23331,12 +23623,14 @@@ F:        include/xen/arm/swiotlb-xen.
  F:    include/xen/swiotlb-xen.h
  
  XFS FILESYSTEM
 -M:    Darrick J. Wong <djwong@kernel.org>
 +M:    Chandan Babu R <chandan.babu@oracle.com>
 +R:    Darrick J. Wong <djwong@kernel.org>
  L:    linux-xfs@vger.kernel.org
  S:    Supported
  W:    http://xfs.org/
  C:    irc://irc.oftc.net/xfs
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 +P:    Documentation/filesystems/xfs-maintainer-entry-profile.rst
  F:    Documentation/ABI/testing/sysfs-fs-xfs
  F:    Documentation/admin-guide/xfs.rst
  F:    Documentation/filesystems/xfs-delayed-logging-design.rst
diff --combined tools/build/feature/Makefile
index f0c5de0,3184f38..dad79ed
--- 1/tools/build/feature/Makefile
--- 2/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@@ -340,7 -340,7 +340,7 @@@ $(OUTPUT)test-jvmti-cmlr.bin
        $(BUILD)
  
  $(OUTPUT)test-llvm.bin:
-       $(BUILDXX) -std=gnu++14                                 \
+       $(BUILDXX) -std=gnu++17                                 \
                -I$(shell $(LLVM_CONFIG) --includedir)          \
                -L$(shell $(LLVM_CONFIG) --libdir)              \
                $(shell $(LLVM_CONFIG) --libs Core BPF)         \
@@@ -348,17 -348,15 +348,15 @@@
                > $(@:.bin=.make.output) 2>&1
  
  $(OUTPUT)test-llvm-version.bin:
-       $(BUILDXX) -std=gnu++14                                 \
+       $(BUILDXX) -std=gnu++17                                 \
                -I$(shell $(LLVM_CONFIG) --includedir)          \
                > $(@:.bin=.make.output) 2>&1
  
  $(OUTPUT)test-clang.bin:
-       $(BUILDXX) -std=gnu++14                                 \
+       $(BUILDXX) -std=gnu++17                                 \
                -I$(shell $(LLVM_CONFIG) --includedir)          \
                -L$(shell $(LLVM_CONFIG) --libdir)              \
-               -Wl,--start-group -lclangBasic -lclangDriver    \
-                 -lclangFrontend -lclangEdit -lclangLex        \
-                 -lclangAST -Wl,--end-group                    \
+               -Wl,--start-group -lclang-cpp -Wl,--end-group   \
                $(shell $(LLVM_CONFIG) --libs Core option)      \
                $(shell $(LLVM_CONFIG) --system-libs)           \
                > $(@:.bin=.make.output) 2>&1
@@@ -372,7 -370,7 +370,7 @@@ $(OUTPUT)test-libzstd.bin
        $(BUILD) -lzstd
  
  $(OUTPUT)test-clang-bpf-co-re.bin:
 -      $(CLANG) -S -g -target bpf -o - $(patsubst %.bin,%.c,$(@F)) |   \
 +      $(CLANG) -S -g --target=bpf -o - $(patsubst %.bin,%.c,$(@F)) |  \
                grep BTF_KIND_VAR
  
  $(OUTPUT)test-file-handle.bin:
diff --combined tools/perf/bench/Build
index 07bbc44,47412d4..c2ab309
--- 1/tools/perf/bench/Build
--- 2/tools/perf/bench/Build
+++ b/tools/perf/bench/Build
@@@ -1,6 -1,5 +1,6 @@@
  perf-y += sched-messaging.o
  perf-y += sched-pipe.o
 +perf-y += sched-seccomp-notify.o
  perf-y += syscall.o
  perf-y += mem-functions.o
  perf-y += futex-hash.o
@@@ -17,6 -16,7 +17,7 @@@ perf-y += inject-buildid.
  perf-y += evlist-open-close.o
  perf-y += breakpoint.o
  perf-y += pmu-scan.o
+ perf-y += uprobe.o
  
  perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-asm.o
  perf-$(CONFIG_X86_64) += mem-memset-x86-64-asm.o
diff --combined tools/perf/bench/bench.h
index a0625c7,50de477..faa18e6
--- 1/tools/perf/bench/bench.h
--- 2/tools/perf/bench/bench.h
+++ b/tools/perf/bench/bench.h
@@@ -21,7 -21,6 +21,7 @@@ extern struct timeval bench__start, ben
  int bench_numa(int argc, const char **argv);
  int bench_sched_messaging(int argc, const char **argv);
  int bench_sched_pipe(int argc, const char **argv);
 +int bench_sched_seccomp_notify(int argc, const char **argv);
  int bench_syscall_basic(int argc, const char **argv);
  int bench_syscall_getpgid(int argc, const char **argv);
  int bench_syscall_fork(int argc, const char **argv);
@@@ -43,6 -42,9 +43,9 @@@ int bench_inject_build_id(int argc, con
  int bench_evlist_open_close(int argc, const char **argv);
  int bench_breakpoint_thread(int argc, const char **argv);
  int bench_breakpoint_enable(int argc, const char **argv);
+ int bench_uprobe_baseline(int argc, const char **argv);
+ int bench_uprobe_empty(int argc, const char **argv);
+ int bench_uprobe_trace_printk(int argc, const char **argv);
  int bench_pmu_scan(int argc, const char **argv);
  
  #define BENCH_FORMAT_DEFAULT_STR      "default"
diff --combined tools/perf/builtin-bench.c
index 5033e8b,f60ccaf..1a8898d
--- 1/tools/perf/builtin-bench.c
--- 2/tools/perf/builtin-bench.c
+++ b/tools/perf/builtin-bench.c
@@@ -47,7 -47,6 +47,7 @@@ static struct bench numa_benchmarks[] 
  static struct bench sched_benchmarks[] = {
        { "messaging",  "Benchmark for scheduling and IPC",             bench_sched_messaging   },
        { "pipe",       "Benchmark for pipe() between two processes",   bench_sched_pipe        },
 +      { "seccomp-notify",     "Benchmark for seccomp user notify",    bench_sched_seccomp_notify},
        { "all",        "Run all scheduler benchmarks",         NULL                    },
        { NULL,         NULL,                                           NULL                    }
  };
@@@ -105,6 -104,13 +105,13 @@@ static struct bench breakpoint_benchmar
        { NULL, NULL, NULL },
  };
  
+ static struct bench uprobe_benchmarks[] = {
+       { "baseline",   "Baseline libc usleep(1000) call",                              bench_uprobe_baseline,  },
+       { "empty",      "Attach empty BPF prog to uprobe on usleep, system wide",       bench_uprobe_empty,     },
+       { "trace_printk", "Attach trace_printk BPF prog to uprobe on usleep syswide",   bench_uprobe_trace_printk,      },
+       { NULL, NULL, NULL },
+ };
+ 
  struct collection {
        const char      *name;
        const char      *summary;
@@@ -124,6 -130,7 +131,7 @@@ static struct collection collections[] 
  #endif
        { "internals",  "Perf-internals benchmarks",                    internals_benchmarks    },
        { "breakpoint", "Breakpoint benchmarks",                        breakpoint_benchmarks   },
+       { "uprobe",     "uprobe benchmarks",                            uprobe_benchmarks       },
        { "all",        "All benchmarks",                               NULL                    },
        { NULL,         NULL,                                           NULL                    }
  };
Domain: System / Kernel;