diff options
| author | Mark Brown <broonie@kernel.org> | 2023-04-14 17:54:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-04-14 17:54:46 +0100 |
| commit | d3f2cd24819158bb70701c3549e586f9df9cee67 (patch) | |
| tree | 5c3ecc8043f171fa41b2588df9a86187c00621e2 /Next/merge.log | |
| parent | ab7cc86660bf41380bfa9cc79bf9103b91b16b13 (diff) | |
| download | linux-next-next-20230414.tar.gz | |
Add linux-next specific files for 20230414next-20230414
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 16223 |
1 files changed, 16223 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..0aade0dc1a70 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,16223 @@ +$ date -R +Fri, 14 Apr 2023 12:38:45 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 57% (6460/11234)
Updating files: 58% (6516/11234)
Updating files: 59% (6629/11234)
Updating files: 60% (6741/11234)
Updating files: 61% (6853/11234)
Updating files: 62% (6966/11234)
Updating files: 63% (7078/11234)
Updating files: 64% (7190/11234)
Updating files: 65% (7303/11234)
Updating files: 66% (7415/11234)
Updating files: 67% (7527/11234)
Updating files: 68% (7640/11234)
Updating files: 69% (7752/11234)
Updating files: 70% (7864/11234)
Updating files: 71% (7977/11234)
Updating files: 72% (8089/11234)
Updating files: 73% (8201/11234)
Updating files: 74% (8314/11234)
Updating files: 75% (8426/11234)
Updating files: 76% (8538/11234)
Updating files: 77% (8651/11234)
Updating files: 78% (8763/11234)
Updating files: 79% (8875/11234)
Updating files: 80% (8988/11234)
Updating files: 81% (9100/11234)
Updating files: 82% (9212/11234)
Updating files: 83% (9325/11234)
Updating files: 84% (9437/11234)
Updating files: 85% (9549/11234)
Updating files: 86% (9662/11234)
Updating files: 87% (9774/11234)
Updating files: 88% (9886/11234)
Updating files: 89% (9999/11234)
Updating files: 90% (10111/11234)
Updating files: 91% (10223/11234)
Updating files: 91% (10248/11234)
Updating files: 92% (10336/11234)
Updating files: 93% (10448/11234)
Updating files: 94% (10560/11234)
Updating files: 95% (10673/11234)
Updating files: 96% (10785/11234)
Updating files: 97% (10897/11234)
Updating files: 98% (11010/11234)
Updating files: 99% (11122/11234)
Updating files: 100% (11234/11234)
Updating files: 100% (11234/11234), done. +HEAD is now at de4664485abbc Merge tag 'for-linus-2023041201' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid +Merging origin/master (44149752e9987 Merge tag 'cgroup-for-6.3-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating de4664485abbc..44149752e9987 +Fast-forward (no commit created; -m option ignored) + ...yaml => loongson,cpu-interrupt-controller.yaml} | 6 +- + Documentation/networking/ip-sysctl.rst | 2 + + arch/arm64/net/bpf_jit.h | 4 + + arch/arm64/net/bpf_jit_comp.c | 3 +- + arch/loongarch/net/bpf_jit.c | 4 + + drivers/bluetooth/btbcm.c | 2 +- + drivers/bluetooth/btsdio.c | 1 + + drivers/bus/imx-weim.c | 6 + + drivers/clk/clk-renesas-pcie.c | 3 +- + drivers/clk/imx/clk-imx6ul.c | 10 +- + drivers/clk/sprd/common.c | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 57 ++++- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 6 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 4 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 87 ++++++- + drivers/gpu/drm/armada/armada_drv.c | 1 - + drivers/gpu/drm/i915/display/icl_dsi.c | 20 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c | 1 + + drivers/gpu/drm/scheduler/sched_entity.c | 11 +- + drivers/i2c/i2c-core-of.c | 5 + + drivers/net/bonding/bond_main.c | 5 +- + drivers/net/ethernet/cadence/macb_main.c | 4 + + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 16 ++ + drivers/net/ethernet/intel/iavf/iavf.h | 20 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 44 ++-- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 68 +++--- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 22 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 63 ++++- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 8 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/cpsw_new.c | 3 +- + drivers/net/phy/nxp-c45-tja11xx.c | 14 +- + drivers/net/phy/sfp.c | 19 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/veth.c | 10 +- + drivers/net/wwan/iosm/iosm_ipc_pcie.c | 3 +- + drivers/of/dynamic.c | 1 + + drivers/of/platform.c | 5 + + drivers/pinctrl/pinctrl-amd.c | 36 ++- + drivers/spi/spi.c | 5 + + drivers/video/fbdev/core/fbcon.c | 18 +- + drivers/video/fbdev/core/fbmem.c | 2 + + include/linux/mlx5/device.h | 14 +- + include/linux/netdevice.h | 3 +- + include/linux/rtnetlink.h | 3 +- + include/net/bluetooth/hci_core.h | 1 + + include/net/bonding.h | 8 +- + include/net/xdp.h | 47 ++++ + kernel/cgroup/cpuset.c | 178 +++++++++++--- + kernel/cgroup/legacy_freezer.c | 7 +- + kernel/cgroup/rstat.c | 4 +- + net/bluetooth/hci_conn.c | 89 ++++--- + net/bluetooth/hci_event.c | 18 +- + net/bluetooth/hci_sync.c | 13 +- + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap_core.c | 24 +- + net/bluetooth/sco.c | 85 ++++--- + net/core/dev.c | 3 +- + net/core/rtnetlink.c | 11 +- + net/core/skbuff.c | 16 +- + net/core/xdp.c | 10 +- + net/ipv4/sysctl_net_ipv4.c | 3 + + net/ipv4/tcp_ipv4.c | 4 +- + net/ipv6/udp.c | 8 +- + net/mptcp/fastopen.c | 11 +- + net/mptcp/options.c | 5 +- + net/mptcp/protocol.c | 2 +- + net/mptcp/subflow.c | 18 +- + net/openvswitch/actions.c | 2 +- + net/qrtr/af_qrtr.c | 8 +- + net/sctp/stream_interleave.c | 3 +- + net/smc/af_smc.c | 11 + + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 30 ++- + .../selftests/bpf/prog_tests/xdp_metadata.c | 2 + + .../testing/selftests/bpf/progs/xdp_hw_metadata.c | 42 ++-- + tools/testing/selftests/bpf/progs/xdp_metadata.c | 6 +- + tools/testing/selftests/bpf/progs/xdp_metadata2.c | 7 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 10 +- + tools/testing/selftests/bpf/xdp_metadata.h | 4 + + .../testing/selftests/drivers/net/bonding/Makefile | 3 +- + .../selftests/drivers/net/bonding/bond_options.sh | 264 +++++++++++++++++++++ + .../drivers/net/bonding/bond_topo_3d1c.sh | 143 +++++++++++ + .../selftests/drivers/net/bonding/option_prio.sh | 245 ------------------- + tools/testing/selftests/net/config | 1 + + tools/testing/selftests/net/mptcp/userspace_pm.sh | 2 + + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 2 +- + 91 files changed, 1370 insertions(+), 622 deletions(-) + rename Documentation/devicetree/bindings/interrupt-controller/{loongarch,cpu-interrupt-controller.yaml => loongson,cpu-interrupt-controller.yaml} (72%) + create mode 100755 tools/testing/selftests/drivers/net/bonding/bond_options.sh + create mode 100644 tools/testing/selftests/drivers/net/bonding/bond_topo_3d1c.sh + delete mode 100755 tools/testing/selftests/drivers/net/bonding/option_prio.sh +Merging fixes/fixes (1c23f9e627a7b Linux 6.0-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (d91277db9dd45 mm: kmsan: handle alloc failures in kmsan_ioremap_page_range()) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'recursive' strategy. + .mailmap | 2 + + fs/fs-writeback.c | 17 +++--- + fs/userfaultfd.c | 6 ++- + include/linux/kmsan.h | 39 +++++++------- + include/trace/events/huge_memory.h | 3 +- + kernel/fork.c | 1 + + kernel/sys.c | 69 +++++++++++++----------- + lib/maple_tree.c | 19 +++---- + mm/backing-dev.c | 12 ++++- + mm/huge_memory.c | 19 +++++-- + mm/khugepaged.c | 14 +++++ + mm/kmsan/hooks.c | 55 +++++++++++++++++--- + mm/kmsan/shadow.c | 27 ++++++---- + mm/memory.c | 3 ++ + mm/mempolicy.c | 104 +++++++++++++++++-------------------- + mm/mprotect.c | 2 +- + mm/page_alloc.c | 16 ++++++ + mm/swap.c | 2 +- + mm/vmalloc.c | 10 ++-- + tools/mm/page_owner_sort.c | 2 +- + 20 files changed, 269 insertions(+), 153 deletions(-) +Merging kbuild-current/fixes (9c2450e5fad39 kbuild: do not create intermediate *.tar for tar packages) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Merge made by the 'recursive' strategy. + Documentation/kbuild/llvm.rst | 4 ++ + arch/riscv/purgatory/Makefile | 7 +-- + arch/x86/purgatory/Makefile | 3 +- + scripts/Makefile.package | 64 ++++++++++++------------- + scripts/package/gen-diff-patch | 62 +++++++++++-------------- + scripts/package/mkdebian | 103 +++++++++++++++++++++++------------------ + scripts/package/mkspec | 11 +---- + 7 files changed, 127 insertions(+), 127 deletions(-) +Merging arc-current/for-curr (30a0b95b1335e Linux 6.1-rc3) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (c76c6c4ecbec0 ARM: 9294/2: vfp: Fix broken softirq handling with instrumentation enabled) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/include/asm/assembler.h | 13 ------------- + arch/arm/vfp/entry.S | 17 +++-------------- + arch/arm/vfp/vfphw.S | 30 +++++++++++++++++------------- + arch/arm/vfp/vfpmodule.c | 27 ++++++++++++++++++++++----- + 4 files changed, 42 insertions(+), 45 deletions(-) +Merging arm64-fixes/for-next/fixes (32d8599968060 arm64: compat: Work around uninitialized variable warning) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (4f7e22b8b6341 Merge tag 'riscv-dt-fixes-for-v6.3-final' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx6ull-colibri.dtsi | 12 ++------ + arch/arm/boot/dts/imx7d-remarkable2.dts | 2 -- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 15 +++++----- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 4 +-- + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 4 +-- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +- + arch/riscv/boot/dts/canaan/k210.dtsi | 1 - + drivers/perf/amlogic/meson_g12_ddr_pmu.c | 34 +++++++++++----------- + drivers/tee/optee/call.c | 2 +- + drivers/tee/tee_shm.c | 2 +- + 13 files changed, 37 insertions(+), 47 deletions(-) +Merging davinci-current/davinci/for-current (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (ceaa837f96adb Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (e36a82bebbf7d m68k: Only force 030 bus error if PC not in exception table) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (b277fc793daf2 powerpc/papr_scm: Update the NUMA distance table for the target node) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/mm/numa.c | 1 + + arch/powerpc/platforms/pseries/papr_scm.c | 7 +++++++ + 2 files changed, 8 insertions(+) +Merging s390-fixes/fixes (f9bbf25e7b2b7 s390/ptrace: fix PTRACE_GET_LAST_BREAK error handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc3 sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 13205 and retry the command. +Merge made by the 'recursive' strategy. +Merging fscrypt-current/for-current (4bcf6f827a79c fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (a075bacde257f fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging net/main (3037933448f60 net: sched: sch_qfq: prevent slab-out-of-bounds in qfq_activate_agg) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'recursive' strategy. + net/sched/sch_qfq.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) +Merging bpf/master (829cca4d17830 Merge tag 'net-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (430cac4874004 xfrm: don't check the default policy if the policy allows the packet) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_policy.c | 6 ------ + 1 file changed, 6 deletions(-) +Merging netfilter/master (7fb0269720d7d Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/main (5f70bcbca469a net: wwan: iosm: fixes 7560 modem crash) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (e6db67fa871de wifi: mt76: ignore key disable commands) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging wpan/master (bd4e3d82f4ccb MAINTAINERS: Add wpan patchwork) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 +++-- + drivers/net/ieee802154/mac802154_hwsim.c | 6 ++++-- + 2 files changed, 7 insertions(+), 4 deletions(-) +Merging rdma-fixes/for-rc (aca3b0fa3d04b RDMA/core: Fix GID entry ref leak when create_ah fails) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cma.c | 60 +++++++++++++++++-------------- + drivers/infiniband/core/verbs.c | 2 ++ + drivers/infiniband/hw/erdma/erdma_cq.c | 2 +- + drivers/infiniband/hw/erdma/erdma_hw.h | 4 +-- + drivers/infiniband/hw/erdma/erdma_main.c | 2 +- + drivers/infiniband/hw/erdma/erdma_qp.c | 4 +-- + drivers/infiniband/hw/erdma/erdma_verbs.h | 2 +- + drivers/infiniband/hw/irdma/cm.c | 16 +++++---- + drivers/infiniband/hw/irdma/cm.h | 2 +- + drivers/infiniband/hw/irdma/hw.c | 3 ++ + drivers/infiniband/hw/irdma/utils.c | 5 ++- + drivers/infiniband/hw/mlx5/main.c | 4 +++ + 12 files changed, 65 insertions(+), 41 deletions(-) +Merging sound-current/for-linus (6ab6f98fcdc9d ALSA: hda/hdmi: disable KAE for Intel DG2) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'recursive' strategy. + Documentation/sound/hd-audio/models.rst | 2 +- + sound/firewire/tascam/tascam-stream.c | 2 +- + sound/i2c/cs8427.c | 7 +++++-- + sound/pci/emu10k1/emupcm.c | 14 +++++++++----- + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pci/hda/patch_realtek.c | 29 +++++++++++++++++++++++++++++ + sound/pci/hda/patch_sigmatel.c | 10 ++++++++++ + 7 files changed, 56 insertions(+), 10 deletions(-) +Merging sound-asoc-fixes/for-linus (352e1eb17eee8 ASoC: max98373: change power down sequence for smart amp) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/max98373.c | 4 ++-- + sound/soc/sof/ipc4-topology.c | 10 ++++++---- + sound/soc/sof/pm.c | 8 +++++++- + 3 files changed, 15 insertions(+), 7 deletions(-) +Merging regmap-fixes/for-linus (eeac8ede17557 Linux 6.3-rc2) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (7c7504067c709 regulator: sm5703: Fix missing n_voltages for fixed regulators) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/fan53555.c | 13 +++++++------ + drivers/regulator/sm5703-regulator.c | 2 ++ + 2 files changed, 9 insertions(+), 6 deletions(-) +Merging spi-fixes/for-linus (e8d018dd0257f Linux 6.3-rc3) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (7e364e56293bb Linux 6.3-rc5) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (09a9639e56c01 Linux 6.3-rc6) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (09a9639e56c01 Linux 6.3-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (09a9639e56c01 Linux 6.3-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (eeac8ede17557 Linux 6.3-rc2) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (fdbd2de0b93eb iio: adc: mt6370: Fix ibus and ibat scaling value of some specific vendor ID chips) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'recursive' strategy. + drivers/iio/adc/at91-sama5d2_adc.c | 2 +- + drivers/iio/adc/imx93_adc.c | 7 +++-- + drivers/iio/adc/mt6370-adc.c | 53 ++++++++++++++++++++++++++++++++++++-- + drivers/iio/dac/ad5755.c | 1 + + drivers/iio/light/tsl2772.c | 1 + + 5 files changed, 57 insertions(+), 7 deletions(-) +Merging counter-current/counter-current (09a9639e56c01 Linux 6.3-rc6) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (a042d7feae7ef Merge tag 'fpga-for-6.3-final' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/fpga/dfl-pci.c | 20 ++++++-------------- + drivers/fpga/fpga-bridge.c | 3 ++- + drivers/fpga/intel-m10-bmc-sec-update.c | 2 +- + drivers/fpga/xilinx-pr-decoupler.c | 2 +- + 4 files changed, 10 insertions(+), 17 deletions(-) +Merging soundwire-fixes/fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (09a9639e56c01 Linux 6.3-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (5dc63e56a9cf8 Input: cyttsp5 - fix sensing configuration data structure) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1621 and retry the command. +Merge made by the 'recursive' strategy. + drivers/input/tablet/pegasus_notetaker.c | 6 ++++++ + drivers/input/touchscreen/cyttsp5.c | 1 + + 2 files changed, 7 insertions(+) +Merging crypto-current/master (660ca9470f9c6 crypto: caam - Fix edesc/iv ordering mixup) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (4928f67bc911e vfio/mlx5: Fix the report of dirty_bytes upon pre-copy) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (f1594bc676579 selftests mount: Fix mount_setattr_test builds failed) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (f412eef03938d Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (d9503be5a100c dmaengine: apple-admac: Fix 'current_tx' not getting freed) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (88603b6dc4194 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (93942b7046157 mtd: rawnand: meson: fix bitmask for length in command word) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (88603b6dc4194 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (8df08ba4a331e media: ov5670: Fix probe on ACPI) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/i2c/ov5670.c | 2 +- + drivers/media/v4l2-core/v4l2-subdev.c | 92 +++++++++++++++++++++++------------ + 2 files changed, 63 insertions(+), 31 deletions(-) +Merging reset-fixes/reset/fixes (3a2390c6777e3 reset: uniphier-glue: Fix possible null-ptr-deref) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (ab327f8acdf8d mips: bmips: BCM6358: disable RAC flush for TP1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2a906db2824b7 Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (0bf9601f8ef07 Merge tag 'kvmarm-fixes-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (21f27df854008 KVM: s390: pv: fix external interruption loop not always detected) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (7e364e56293bb Linux 6.3-rc5) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (c91d713630848 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (ca712e4705467 Merge branch 'for-6.3/cxl-doe-fixes' into for-6.3/cxl) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (010eb030962ec Merge branch 'misc-6.3' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Already up to date! +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1617 and retry the command. +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (609d54441493c fs: prevent out-of-bounds array speculation when closing a file descriptor) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (bbb73a103fbbe swiotlb: fix a braino in the alignment check fix) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (9a469c6dfab38 platform/x86: thinkpad_acpi: Add missing T14s Gen1 type to s2idle quirk list) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (1a50d9403fb90 treewide: Fix probing of devices in DT overlays) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (c8e22b7a1694b scsi: ses: Handle enclosure with just a primary component gracefully) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/scsi/ses.c | 20 ++++++++------------ + 1 file changed, 8 insertions(+), 12 deletions(-) +Merging drm-fixes/drm-fixes (cab2932213c5c Merge tag 'drm-misc-fixes-2023-04-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (6b8446859c971 drm/i915/dsi: fix DSS CTL register offsets for TGL+) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (4b6d621c9d859 memstick: fix memory leak if card device is never registered) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/memstick/core/memstick.c | 5 ++++- + drivers/mmc/host/sdhci_am654.c | 2 -- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging rtc-fixes/rtc-fixes (08279468a294d rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (1b929c02afd37 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (f8acb24aaf89f x86/hyperv: Block root partition functionality in a Confidential VM) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (4b0986a3613c9 Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (1b50f956c8fe9 riscv: No need to relocate the dtb as it lies in the fixmap region) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/riscv/vm-layout.rst | 6 +-- + arch/riscv/include/asm/fixmap.h | 8 ++++ + arch/riscv/include/asm/pgtable.h | 8 +++- + arch/riscv/kernel/setup.c | 6 +-- + arch/riscv/kernel/signal.c | 9 ++++- + arch/riscv/mm/init.c | 82 +++++++++++++++++---------------------- + 6 files changed, 62 insertions(+), 57 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (8056dc043d7f7 riscv: dts: canaan: drop invalid spi-max-frequency) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (dc70eb868b9cd fpga: bridge: properly initialize bridge device before populating children) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (2ce987d7eeb16 gpio: 104-idi-48: Enable use_raw_spinlock for idi48_regmap_config) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-104-dio-48e.c | 1 + + drivers/gpio/gpio-104-idi-48.c | 1 + + 2 files changed, 2 insertions(+) +Merging gpio-intel-fixes/fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (3993f4f456309 erofs: use wrapper i_blocksize() in erofs_file_read_iter()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (2241ab53cbb5c Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (647037adcad00 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (c8bc346606287 sunrpc: Fix RFC6803 encryption test) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1617 and retry the command. +Merge made by the 'recursive' strategy. + net/sunrpc/auth_gss/gss_krb5_test.c | 1 + + 1 file changed, 1 insertion(+) +Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b9 irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca18 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1c Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (5b201a82cd9d0 perf tools: Add Adrian Hunter to MAINTAINERS as a reviewer) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (0b1d9debe3030 efi/libstub: randomalloc: Return EFI_OUT_OF_RESOURCES on failure) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (6906598f1ce93 zstd: Fix definition of assert()) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging battery-fixes/fixes (06615d11cc781 power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging uml-fixes/fixes (a3046a618a284 um: Only disable SSE on clang to work around old GCC bugs) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb1 Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging iommufd-fixes/for-rc (13a0d1ae7ee6b iommufd: Do not corrupt the pfn list when doing batch carry) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (8197cc33f4215 rust: allow to use INIT_STACK_ALL_ZERO) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Merge made by the 'recursive' strategy. + Documentation/rust/arch-support.rst | 2 +- + rust/Makefile | 16 +++++++++++++++- + rust/kernel/print.rs | 6 +++++- + rust/kernel/str.rs | 2 +- + scripts/generate_rust_analyzer.py | 5 ++++- + scripts/is_rust_module.sh | 2 +- + 6 files changed, 27 insertions(+), 6 deletions(-) +Merging v9fs-fixes/fixes/next (347dca97f75d4 Update email address and mailing list for v9fs) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (11b3b9f461c5c drm/sched: Check scheduler ready before calling timeout handling) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/scheduler/sched_main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging mm-stable/mm-stable (d46031f40e0f7 sched/numa: use hash_32 to mix up PIDs accessing VMA) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging mm/vmalloc.c +Auto-merging mm/swapfile.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mprotect.c +Auto-merging mm/mmap.c +Auto-merging mm/memory.c +Auto-merging mm/khugepaged.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging lib/maple_tree.c +Auto-merging kernel/fork.c +Auto-merging include/linux/mm_types.h +Auto-merging fs/userfaultfd.c +Auto-merging arch/powerpc/include/asm/book3s/64/tlbflush.h +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/admin-guide/mm/userfaultfd.rst | 25 + + Documentation/core-api/printk-formats.rst | 16 +- + Documentation/filesystems/locking.rst | 4 +- + Documentation/filesystems/proc.rst | 8 + + Documentation/filesystems/tmpfs.rst | 66 +- + Documentation/mm/active_mm.rst | 6 + + Documentation/mm/arch_pgtable_helpers.rst | 2 +- + Documentation/mm/multigen_lru.rst | 44 +- + Documentation/mm/unevictable-lru.rst | 2 + + MAINTAINERS | 5 +- + arch/Kconfig | 32 + + arch/arc/Kconfig | 4 +- + arch/arm/Kconfig | 9 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/milbeaut_m10v_defconfig | 2 +- + arch/arm/configs/oxnas_v6_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/sama7_defconfig | 2 +- + arch/arm/configs/sp7021_defconfig | 2 +- + arch/arm/mach-rpc/ecard.c | 2 +- + arch/arm64/Kconfig | 28 +- + arch/arm64/include/asm/memory.h | 8 +- + arch/arm64/include/asm/mte-kasan.h | 81 + + arch/arm64/include/asm/mte.h | 12 - + arch/arm64/include/asm/pgtable.h | 2 +- + arch/arm64/include/asm/sparsemem.h | 2 +- + arch/arm64/include/asm/uaccess.h | 66 +- + arch/arm64/include/asm/word-at-a-time.h | 4 +- + arch/arm64/kvm/hyp/include/nvhe/gfp.h | 2 +- + arch/arm64/kvm/hyp/nvhe/page_alloc.c | 10 +- + arch/arm64/mm/fault.c | 36 + + arch/csky/Kconfig | 2 +- + arch/ia64/Kconfig | 8 +- + arch/ia64/include/asm/sparsemem.h | 4 +- + arch/ia64/mm/hugetlbpage.c | 2 +- + arch/loongarch/Kconfig | 12 +- + arch/m68k/Kconfig.cpu | 5 +- + arch/mips/Kconfig | 15 +- + arch/mips/include/asm/fixmap.h | 2 +- + arch/mips/include/asm/pgtable.h | 3 +- + arch/nios2/Kconfig | 7 +- + arch/powerpc/Kconfig | 28 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 2 +- + arch/powerpc/configs/fsl-emb-nonhw.config | 2 +- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 3 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 4 +- + arch/powerpc/mm/fault.c | 37 + + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 1 + + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 1 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/pgtable.h | 12 +- + arch/s390/mm/fault.c | 24 + + arch/sh/configs/ecovec24_defconfig | 2 +- + arch/sh/mm/Kconfig | 17 +- + arch/sparc/Kconfig | 5 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/sparc/mm/tsb.c | 4 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/string_64.h | 23 +- + arch/x86/mm/fault.c | 36 + + arch/x86/mm/pat/memtype.c | 12 +- + arch/xtensa/Kconfig | 5 +- + drivers/base/regmap/regmap-debugfs.c | 8 +- + drivers/block/floppy.c | 2 +- + drivers/crypto/ccp/sev-dev.c | 2 +- + drivers/crypto/hisilicon/sgl.c | 6 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- + drivers/gpu/drm/ttm/ttm_pool.c | 22 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 +- + drivers/iommu/dma-iommu.c | 4 +- + drivers/irqchip/irq-gic-v3-its.c | 4 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-cache-metadata.c | 2 +- + drivers/md/dm-thin-metadata.c | 2 +- + drivers/misc/genwqe/card_utils.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.h | 2 +- + drivers/video/fbdev/hyperv_fb.c | 4 +- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/virtio/virtio_balloon.c | 2 +- + drivers/virtio/virtio_mem.c | 12 +- + fs/afs/dir.c | 10 +- + fs/afs/dir_edit.c | 2 +- + fs/afs/file.c | 14 +- + fs/afs/inode.c | 27 +- + fs/afs/internal.h | 1 + + fs/afs/write.c | 4 +- + fs/exec.c | 2 +- + fs/ext4/inode.c | 2 +- + fs/ext4/move_extent.c | 8 +- + fs/hugetlbfs/inode.c | 2 +- + fs/iomap/buffered-io.c | 11 +- + fs/jfs/jfs_metapage.c | 39 +- + fs/netfs/buffered_read.c | 4 +- + fs/nfs/file.c | 4 +- + fs/nilfs2/page.c | 6 +- + fs/ocfs2/refcounttree.c | 9 +- + fs/proc/kcore.c | 85 +- + fs/proc/meminfo.c | 13 + + fs/ramfs/file-nommu.c | 2 +- + fs/super.c | 2 +- + fs/ufs/dir.c | 29 +- + fs/userfaultfd.c | 45 +- + fs/xfs/xfs_file.c | 17 +- + include/asm-generic/pgalloc.h | 4 +- + include/drm/ttm/ttm_pool.h | 2 +- + include/linux/gfp.h | 7 +- + include/linux/gfp_types.h | 30 +- + include/linux/highmem.h | 8 +- + include/linux/huge_mm.h | 41 +- + include/linux/hugetlb.h | 29 +- + include/linux/io-mapping.h | 20 +- + include/linux/memblock.h | 2 + + include/linux/memcontrol.h | 1 + + include/linux/mm.h | 168 +- + include/linux/mm_inline.h | 6 + + include/linux/mm_types.h | 46 +- + include/linux/mmap_lock.h | 37 +- + include/linux/mmzone.h | 21 +- + include/linux/page-flags.h | 16 +- + include/linux/page_ext.h | 2 - + include/linux/pageblock-flags.h | 4 +- + include/linux/pagemap.h | 21 +- + include/linux/pgtable.h | 9 +- + include/linux/sched/mm.h | 28 + + include/linux/shmem_fs.h | 10 +- + include/linux/slab.h | 7 +- + include/linux/swap.h | 20 +- + include/linux/uio.h | 2 + + include/linux/userfaultfd_k.h | 92 +- + include/linux/vm_event_item.h | 6 + + include/linux/vmalloc.h | 7 +- + include/linux/vmstat.h | 6 + + include/trace/events/cma.h | 58 +- + include/trace/events/ksm.h | 251 ++ + include/trace/events/mmflags.h | 94 +- + include/uapi/linux/userfaultfd.h | 17 +- + init/main.c | 74 +- + kernel/cpu.c | 2 +- + kernel/crash_core.c | 2 +- + kernel/dma/pool.c | 6 +- + kernel/events/ring_buffer.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 163 +- + kernel/kthread.c | 22 +- + kernel/sched/core.c | 15 +- + kernel/sched/fair.c | 57 + + lib/Kconfig.debug | 10 + + lib/iov_iter.c | 48 + + lib/maple_tree.c | 1 + + lib/stackdepot.c | 12 + + lib/test_printf.c | 26 + + lib/vsprintf.c | 21 + + mm/Kconfig | 31 +- + mm/Kconfig.debug | 6 + + mm/Makefile | 1 + + mm/cma.c | 1 + + mm/cma_sysfs.c | 2 +- + mm/compaction.c | 20 +- + mm/damon/sysfs-schemes.c | 4 +- + mm/debug.c | 7 + + mm/debug_vm_pgtable.c | 10 +- + mm/dmapool_test.c | 147 + + mm/filemap.c | 27 +- + mm/folio-compat.c | 4 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 67 +- + mm/hugetlb.c | 38 +- + mm/hugetlb_vmemmap.c | 16 +- + mm/init-mm.c | 3 + + mm/internal.h | 55 +- + mm/kasan/hw_tags.c | 14 +- + mm/kasan/kasan.h | 38 +- + mm/kasan/kasan_test.c | 2 +- + mm/kasan/report.c | 59 +- + mm/khugepaged.c | 27 +- + mm/kmsan/init.c | 6 +- + mm/kmsan/kmsan_test.c | 97 +- + mm/ksm.c | 21 +- + mm/memblock.c | 2 +- + mm/memcontrol.c | 32 +- + mm/memory-failure.c | 2 +- + mm/memory.c | 269 +- + mm/memory_hotplug.c | 4 +- + mm/memtest.c | 6 + + mm/migrate.c | 1 - + mm/mincore.c | 2 +- + mm/mm_init.c | 2548 ++++++++++++++++ + mm/mmap.c | 270 +- + mm/mmu_gather.c | 2 +- + mm/mprotect.c | 51 +- + mm/mremap.c | 23 +- + mm/nommu.c | 10 +- + mm/page-writeback.c | 40 - + mm/page_alloc.c | 3154 ++------------------ + mm/page_isolation.c | 12 +- + mm/page_owner.c | 6 +- + mm/page_reporting.c | 4 +- + mm/pgtable-generic.c | 2 +- + mm/rmap.c | 38 +- + mm/shmem.c | 117 +- + mm/shrinker_debug.c | 39 +- + mm/shuffle.h | 2 +- + mm/slab.c | 2 +- + mm/slab.h | 1 + + mm/slub.c | 4 +- + mm/swap_state.c | 19 +- + mm/swapfile.c | 10 +- + mm/truncate.c | 15 +- + mm/userfaultfd.c | 209 +- + mm/vmalloc.c | 239 +- + mm/vmscan.c | 186 +- + mm/vmstat.c | 20 +- + mm/zsmalloc.c | 358 ++- + mm/zswap.c | 16 +- + net/smc/smc_ib.c | 2 +- + security/integrity/ima/ima_crypto.c | 2 +- + tools/testing/memblock/linux/mmzone.h | 6 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 15 + + tools/testing/selftests/mm/run_vmtests.sh | 8 + + tools/testing/selftests/mm/split_huge_page_test.c | 6 +- + tools/testing/selftests/mm/userfaultfd.c | 49 +- + tools/testing/selftests/mm/virtual_address_range.c | 24 +- + 233 files changed, 6483 insertions(+), 4803 deletions(-) + create mode 100644 include/trace/events/ksm.h + create mode 100644 mm/dmapool_test.c +Merging mm-nonmm-stable/mm-nonmm-stable (ef55ef3e6400e lib/test-string_helpers: replace UNESCAPE_ANY by UNESCAPE_ALL_MASK) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/accounting/delay-accounting.rst | 14 +- + Documentation/dev-tools/kcov.rst | 169 +++++++++++------- + .../zh_CN/accounting/delay-accounting.rst | 10 +- + MAINTAINERS | 6 - + arch/ia64/kernel/salinfo.c | 2 +- + arch/ia64/mm/contig.c | 2 +- + arch/mips/boot/tools/relocs.c | 2 +- + arch/um/os-Linux/elf_aux.c | 2 +- + arch/x86/include/asm/kexec.h | 3 - + arch/x86/kernel/machine_kexec_64.c | 11 -- + arch/x86/tools/relocs.c | 2 +- + drivers/dca/dca-core.c | 4 +- + drivers/rapidio/devices/tsi721.c | 3 - + drivers/remoteproc/remoteproc_coredump.c | 4 +- + drivers/remoteproc/remoteproc_elf_loader.c | 4 +- + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/eventpoll.c | 195 +++++++++++++-------- + fs/nfs/nfs3acl.c | 5 +- + fs/proc/base.c | 1 - + fs/proc/generic.c | 1 - + fs/proc/proc_sysctl.c | 1 - + fs/proc/vmcore.c | 22 +-- + include/linux/hex.h | 35 ++++ + include/linux/kernel.h | 29 +-- + include/linux/kexec.h | 8 - + include/trace/events/notifier.h | 69 ++++++++ + kernel/hung_task.c | 10 +- + kernel/kexec_file.c | 6 +- + kernel/notifier.c | 6 + + lib/buildid.c | 2 +- + lib/test-string_helpers.c | 2 +- + mm/util.c | 1 + + scripts/checkpatch.pl | 2 + + scripts/gdb/linux/clk.py | 2 + + scripts/gdb/linux/cpus.py | 24 ++- + scripts/gdb/linux/genpd.py | 4 +- + scripts/link-vmlinux.sh | 2 +- + sound/soc/codecs/rt5677.c | 2 +- + tools/accounting/getdelays.c | 24 +-- + tools/bpf/resolve_btfids/main.c | 2 +- + tools/lib/bpf/libbpf.c | 2 +- + tools/lib/bpf/usdt.c | 2 +- + tools/perf/util/symbol-elf.c | 2 +- + 44 files changed, 424 insertions(+), 279 deletions(-) + create mode 100644 include/linux/hex.h + create mode 100644 include/trace/events/notifier.h +Merging mm/mm-everything (32ed3874f2bf1 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Removing tools/testing/selftests/mm/util.h +Removing tools/testing/selftests/mm/userfaultfd.c +Auto-merging kernel/cgroup/rstat.c +Auto-merging kernel/cgroup/cpuset.c +Merge made by the 'recursive' strategy. + Documentation/accounting/delay-accounting.rst | 7 +- + Documentation/process/5.Posting.rst | 22 +- + Documentation/process/submitting-patches.rst | 26 +- + arch/arm/Kconfig | 16 +- + arch/arm64/Kconfig | 26 +- + arch/arm64/include/asm/percpu.h | 16 +- + arch/csky/Kconfig | 4 - + arch/ia64/Kconfig | 3 +- + arch/loongarch/Kconfig | 2 +- + arch/loongarch/include/asm/percpu.h | 23 +- + arch/m68k/Kconfig.cpu | 16 +- + arch/m68k/include/asm/mcf_pgtable.h | 2 +- + arch/nios2/Kconfig | 17 +- + arch/powerpc/Kconfig | 22 +- + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/percpu.h | 5 + + arch/sh/mm/Kconfig | 19 +- + arch/sparc/Kconfig | 16 +- + arch/sparc/include/asm/pgtable_64.h | 116 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/percpu.h | 41 +- + arch/xtensa/Kconfig | 16 +- + drivers/block/zram/zram_drv.c | 382 ++--- + drivers/block/zram/zram_drv.h | 1 - + drivers/dma-buf/heaps/system_heap.c | 5 +- + fs/Kconfig | 9 +- + fs/coredump.c | 2 + + fs/eventpoll.c | 22 +- + fs/inode.c | 3 +- + fs/mpage.c | 66 +- + fs/orangefs/inode.c | 9 +- + fs/proc/stat.c | 26 - + fs/proc/task_mmu.c | 3 +- + fs/xfs/xfs_buf.c | 3 +- + include/asm-generic/percpu.h | 17 + + include/linux/cgroup.h | 2 +- + include/linux/cpuset.h | 16 +- + include/linux/delayacct.h | 15 + + include/linux/highmem.h | 54 +- + include/linux/huge_mm.h | 10 +- + include/linux/hugetlb.h | 4 +- + include/linux/kmsan.h | 43 +- + include/linux/memcontrol.h | 13 +- + include/linux/mm.h | 30 +- + include/linux/mmzone.h | 21 +- + include/linux/page-flags.h | 7 +- + include/linux/page_owner.h | 10 +- + include/linux/percpu-defs.h | 2 + + include/linux/rbtree_augmented.h | 4 +- + include/linux/sched/isolation.h | 12 + + include/linux/shmem_fs.h | 11 +- + include/linux/swap.h | 17 +- + include/linux/uio.h | 26 + + include/linux/vmstat.h | 4 +- + include/trace/events/huge_memory.h | 4 +- + include/uapi/linux/const.h | 2 +- + include/uapi/linux/prctl.h | 2 + + include/uapi/linux/taskstats.h | 6 +- + kernel/cgroup/cpuset.c | 4 +- + kernel/cgroup/rstat.c | 4 +- + kernel/delayacct.c | 14 + + kernel/fork.c | 2 +- + kernel/kcsan/kcsan_test.c | 20 +- + kernel/printk/printk.c | 2 + + kernel/sched/core.c | 1 + + kernel/scs.c | 2 +- + kernel/sys.c | 15 + + lib/iov_iter.c | 17 +- + lib/maple_tree.c | 36 +- + lib/rbtree.c | 2 +- + lib/test_vmalloc.c | 37 + + mm/Kconfig | 6 + + mm/Kconfig.debug | 8 - + mm/backing-dev.c | 4 +- + mm/fadvise.c | 11 +- + mm/huge_memory.c | 155 +- + mm/hugetlb.c | 69 +- + mm/hugetlb_vmemmap.c | 13 +- + mm/internal.h | 36 +- + mm/kasan/kasan_test.c | 22 +- + mm/kasan/quarantine.c | 34 +- + mm/kfence/core.c | 70 +- + mm/kfence/kfence.h | 10 +- + mm/kfence/kfence_test.c | 22 +- + mm/kfence/report.c | 2 +- + mm/khugepaged.c | 420 +++-- + mm/kmsan/core.c | 2 +- + mm/kmsan/kmsan_test.c | 22 +- + mm/madvise.c | 14 +- + mm/memblock.c | 11 +- + mm/memcontrol.c | 127 +- + mm/memory.c | 112 +- + mm/memory_hotplug.c | 13 +- + mm/migrate.c | 2 - + mm/mlock.c | 2 +- + mm/mm_init.c | 10 +- + mm/mprotect.c | 2 - + mm/page_alloc.c | 27 +- + mm/page_owner.c | 8 +- + mm/shmem.c | 132 +- + mm/slab.c | 3 +- + mm/slob.c | 6 +- + mm/slub.c | 5 +- + mm/sparse-vmemmap.c | 3 +- + mm/truncate.c | 21 +- + mm/userfaultfd.c | 88 +- + mm/vmalloc.c | 71 +- + mm/vmscan.c | 199 +-- + mm/vmstat.c | 440 +++-- + mm/workingset.c | 28 +- + mm/zswap.c | 122 +- + samples/Kconfig | 7 + + samples/Makefile | 2 +- + samples/kmemleak/Makefile | 2 +- + scripts/checkpatch.pl | 43 +- + scripts/gdb/linux/constants.py.in | 24 + + scripts/gdb/linux/interrupts.py | 232 +++ + scripts/gdb/linux/proc.py | 16 +- + scripts/gdb/linux/radixtree.py | 90 + + scripts/gdb/linux/timerlist.py | 12 +- + scripts/gdb/linux/utils.py | 13 +- + scripts/gdb/linux/vfs.py | 59 + + scripts/gdb/vmlinux-gdb.py | 8 +- + tools/accounting/getdelays.c | 30 +- + tools/testing/radix-tree/maple.c | 24 + + tools/testing/selftests/mm/.gitignore | 5 +- + tools/testing/selftests/mm/Makefile | 78 +- + tools/testing/selftests/mm/cow.c | 33 +- + tools/testing/selftests/mm/gup_test.c | 5 +- + tools/testing/selftests/mm/hugepage-mremap.c | 7 +- + tools/testing/selftests/mm/hugetlb-madvise.c | 25 +- + tools/testing/selftests/mm/khugepaged.c | 4 + + tools/testing/selftests/mm/ksm_functional_tests.c | 6 +- + tools/testing/selftests/mm/ksm_tests.c | 2 +- + tools/testing/selftests/mm/mkdirty.c | 379 ++++ + tools/testing/selftests/mm/mrelease_test.c | 11 +- + tools/testing/selftests/mm/run_vmtests.sh | 26 +- + tools/testing/selftests/mm/soft-dirty.c | 3 + + tools/testing/selftests/mm/split_huge_page_test.c | 229 ++- + tools/testing/selftests/mm/thuge-gen.c | 19 +- + tools/testing/selftests/mm/transhuge-stress.c | 12 +- + tools/testing/selftests/mm/uffd-common.c | 618 +++++++ + tools/testing/selftests/mm/uffd-common.h | 117 ++ + tools/testing/selftests/mm/uffd-stress.c | 481 ++++++ + tools/testing/selftests/mm/uffd-unit-tests.c | 970 +++++++++++ + tools/testing/selftests/mm/userfaultfd.c | 1903 --------------------- + tools/testing/selftests/mm/util.h | 69 - + tools/testing/selftests/mm/vm_util.c | 180 +- + tools/testing/selftests/mm/vm_util.h | 50 + + 149 files changed, 5865 insertions(+), 3719 deletions(-) + create mode 100644 scripts/gdb/linux/interrupts.py + create mode 100644 scripts/gdb/linux/radixtree.py + create mode 100644 scripts/gdb/linux/vfs.py + create mode 100644 tools/testing/selftests/mm/mkdirty.c + create mode 100644 tools/testing/selftests/mm/uffd-common.c + create mode 100644 tools/testing/selftests/mm/uffd-common.h + create mode 100644 tools/testing/selftests/mm/uffd-stress.c + create mode 100644 tools/testing/selftests/mm/uffd-unit-tests.c + delete mode 100644 tools/testing/selftests/mm/userfaultfd.c + delete mode 100644 tools/testing/selftests/mm/util.h +$ git am -3 ../patches/0001-mm-slab-fix-up-for-mm-kmsan-call-KMSAN-hooks-from-SL.patch +Applying: mm/slab: fix up for "mm: kmsan: call KMSAN hooks from SLUB code" +Using index info to reconstruct a base tree... +M mm/slab_common.c +Falling back to patching base and 3-way merge... +Auto-merging mm/slab_common.c +No changes -- Patch already applied. +$ git am -3 ../patches/crypto-x86-kmsan-disable-accelerated-configs-in-KMSAN-builds.patch +Applying: crypto: x86: kmsan: disable accelerated configs in KMSAN builds +Using index info to reconstruct a base tree... +M crypto/Kconfig +Falling back to patching base and 3-way merge... +Auto-merging crypto/Kconfig +$ git reset HEAD^ +Unstaged changes after reset: +M crypto/Kconfig +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 7ddea5addd677] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Fri Apr 14 12:49:22 2023 +0100 +$ git am -3 ../patches/0001-Revert-drm-msm-gem-Evict-active-GEM-objects-when-nec.patch +Applying: Revert "drm/msm/gem: Evict active GEM objects when necessary" +Using index info to reconstruct a base tree... +M drivers/gpu/drm/msm/msm_gem_shrinker.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/msm/msm_gem_shrinker.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_shrinker.c +Recorded preimage for 'drivers/gpu/drm/msm/msm_gem_shrinker.c' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 Revert "drm/msm/gem: Evict active GEM objects when necessary" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am -3 ../patches/0001-fix-up-for-mm-hwpoison-introduce-per-memory_block-hw.patch +Applying: fix up for "mm/hwpoison: introduce per-memory_block hwpoison counter" +Using index info to reconstruct a base tree... +M drivers/base/memory.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/base/memory.c +CONFLICT (content): Merge conflict in drivers/base/memory.c +Recorded preimage for 'drivers/base/memory.c' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 fix up for "mm/hwpoison: introduce per-memory_block hwpoison counter" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am -3 ../patches/0001-Revert-coding-style.rst-document-BUG-and-WARN-rules-.patch +Applying: Revert "coding-style.rst: document BUG() and WARN() rules ("do not crash the kernel")" +Using index info to reconstruct a base tree... +M Documentation/process/coding-style.rst +Falling back to patching base and 3-way merge... +Auto-merging Documentation/process/coding-style.rst +CONFLICT (content): Merge conflict in Documentation/process/coding-style.rst +Recorded preimage for 'Documentation/process/coding-style.rst' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 Revert "coding-style.rst: document BUG() and WARN() rules ("do not crash the kernel")" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging kbuild/for-next (58ee5ab975abe kconfig: menuconfig: reorder functions to remove forward declarations) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging scripts/link-vmlinux.sh +Merge made by the 'recursive' strategy. + scripts/kallsyms.c | 229 +++++++++------------------ + scripts/kconfig/lxdialog/dialog.h | 27 ---- + scripts/kconfig/lxdialog/menubox.c | 8 - + scripts/kconfig/lxdialog/textbox.c | 267 +++++++++++++++---------------- + scripts/kconfig/mconf.c | 314 ++++++++++++++++++------------------- + scripts/link-vmlinux.sh | 6 +- + scripts/mksysmap | 135 ++++++++++------ + scripts/package/builddeb | 2 +- + 8 files changed, 446 insertions(+), 542 deletions(-) +Merging clang-format/clang-format (781121a7f6d11 clang-format: Fix space after for_each macros) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (c160118a90d4a perf map: Delete two variable initialisations before null pointer checks in sort__sym_from_cmp()) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf-tools-next +Auto-merging tools/perf/util/symbol-elf.c +Removing tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/jaketown/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/ivytown/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/icelakex/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/haswellx/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json +Removing tools/perf/pmu-events/arch/x86/broadwellx/uncore-other.json +Removing tools/build/feature/test-libbpf-btf__raw_data.c +Removing tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c +Removing tools/build/feature/test-libbpf-bpf_program__set_insns.c +Removing tools/build/feature/test-libbpf-bpf_prog_load.c +Removing tools/build/feature/test-libbpf-bpf_object__next_program.c +Removing tools/build/feature/test-libbpf-bpf_object__next_map.c +Removing tools/build/feature/test-libbpf-bpf_map_create.c +Merge made by the 'recursive' strategy. + tools/arch/x86/include/uapi/asm/unistd_32.h | 4 +- + tools/arch/x86/include/uapi/asm/unistd_64.h | 3 + + tools/build/Makefile.feature | 2 + + tools/build/feature/Makefile | 15 +- + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-cxa-demangle.cpp | 17 + + tools/build/feature/test-libbpf-bpf_map_create.c | 8 - + .../feature/test-libbpf-bpf_object__next_map.c | 8 - + .../feature/test-libbpf-bpf_object__next_program.c | 8 - + tools/build/feature/test-libbpf-bpf_prog_load.c | 9 - + .../feature/test-libbpf-bpf_program__set_insns.c | 8 - + .../test-libbpf-btf__load_from_kernel_by_id.c | 8 - + tools/build/feature/test-libbpf-btf__raw_data.c | 8 - + tools/build/feature/test-libbpf.c | 4 + + tools/build/feature/test-scandirat.c | 13 + + tools/include/linux/compiler-gcc.h | 6 +- + tools/include/linux/compiler.h | 4 - + tools/include/linux/coresight-pmu.h | 47 +- + tools/include/uapi/linux/perf_event.h | 3 +- + tools/lib/api/io.h | 45 + + tools/lib/perf/cpumap.c | 7 +- + tools/lib/perf/evlist.c | 31 +- + tools/lib/perf/include/internal/cpumap.h | 3 + + tools/lib/perf/include/internal/evlist.h | 1 - + tools/lib/perf/include/perf/event.h | 2 + + tools/lib/perf/include/perf/evlist.h | 1 + + tools/perf/Build | 2 +- + tools/perf/Documentation/perf-annotate.txt | 3 + + tools/perf/Documentation/perf-config.txt | 8 +- + tools/perf/Documentation/perf-kvm.txt | 9 +- + tools/perf/Documentation/perf-lock.txt | 4 +- + tools/perf/Documentation/perf-record.txt | 60 +- + tools/perf/Documentation/perf-report.txt | 4 + + tools/perf/Documentation/perf-stat.txt | 27 +- + tools/perf/Documentation/perf-top.txt | 10 + + tools/perf/Documentation/topdown.txt | 70 +- + tools/perf/Makefile.config | 126 +- + tools/perf/Makefile.perf | 29 +- + tools/perf/arch/arm/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/arm/util/cs-etm.c | 41 +- + tools/perf/arch/arm64/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/arm64/util/arm-spe.c | 2 +- + tools/perf/arch/arm64/util/kvm-stat.c | 1 - + tools/perf/arch/common.c | 4 +- + tools/perf/arch/common.h | 2 +- + tools/perf/arch/powerpc/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/powerpc/util/header.c | 2 +- + tools/perf/arch/powerpc/util/kvm-stat.c | 3 +- + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 4 +- + tools/perf/arch/powerpc/util/sym-handling.c | 4 +- + tools/perf/arch/s390/annotate/instructions.c | 2 +- + tools/perf/arch/s390/util/Build | 1 + + tools/perf/arch/s390/util/kvm-stat.c | 1 - + tools/perf/arch/s390/util/pmu.c | 23 + + tools/perf/arch/x86/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/x86/tests/insn-x86.c | 4 + + tools/perf/arch/x86/util/auxtrace.c | 4 - + tools/perf/arch/x86/util/event.c | 13 +- + tools/perf/arch/x86/util/evlist.c | 45 +- + tools/perf/arch/x86/util/intel-pt.c | 52 +- + tools/perf/arch/x86/util/iostat.c | 7 +- + tools/perf/arch/x86/util/kvm-stat.c | 7 +- + tools/perf/arch/x86/util/pmu.c | 21 +- + tools/perf/arch/x86/util/topdown.c | 78 +- + tools/perf/arch/x86/util/topdown.h | 1 - + tools/perf/bench/Build | 1 + + tools/perf/bench/bench.h | 2 + + tools/perf/bench/find-bit-bench.c | 8 +- + tools/perf/bench/inject-buildid.c | 3 +- + tools/perf/bench/numa.c | 2 +- + tools/perf/bench/pmu-scan.c | 184 + + tools/perf/bench/syscall.c | 35 + + tools/perf/builtin-annotate.c | 60 +- + tools/perf/builtin-bench.c | 2 + + tools/perf/builtin-buildid-list.c | 6 +- + tools/perf/builtin-c2c.c | 20 +- + tools/perf/builtin-daemon.c | 14 +- + tools/perf/builtin-data.c | 2 +- + tools/perf/builtin-diff.c | 6 +- + tools/perf/builtin-evlist.c | 2 +- + tools/perf/builtin-ftrace.c | 16 +- + tools/perf/builtin-help.c | 1 + + tools/perf/builtin-inject.c | 16 +- + tools/perf/builtin-kallsyms.c | 6 +- + tools/perf/builtin-kmem.c | 6 +- + tools/perf/builtin-kvm.c | 864 +- + tools/perf/builtin-kwork.c | 2 +- + tools/perf/builtin-list.c | 21 +- + tools/perf/builtin-lock.c | 144 +- + tools/perf/builtin-mem.c | 12 +- + tools/perf/builtin-probe.c | 2 +- + tools/perf/builtin-record.c | 56 +- + tools/perf/builtin-report.c | 63 +- + tools/perf/builtin-sched.c | 17 +- + tools/perf/builtin-script.c | 40 +- + tools/perf/builtin-stat.c | 267 +- + tools/perf/builtin-timechart.c | 2 +- + tools/perf/builtin-top.c | 63 +- + tools/perf/builtin-trace.c | 18 +- + tools/perf/builtin-version.c | 9 +- + tools/perf/builtin.h | 3 - + tools/perf/check-headers.sh | 1 - + tools/perf/perf.c | 27 +- + tools/perf/perf.h | 9 - + .../arm/{cortex-a76-n1 => cortex-a76}/branch.json | 0 + .../arm/{cortex-a76-n1 => cortex-a76}/bus.json | 0 + .../arm/{cortex-a76-n1 => cortex-a76}/cache.json | 0 + .../{cortex-a76-n1 => cortex-a76}/exception.json | 0 + .../{cortex-a76-n1 => cortex-a76}/instruction.json | 0 + .../arm/{cortex-a76-n1 => cortex-a76}/memory.json | 0 + .../{cortex-a76-n1 => cortex-a76}/pipeline.json | 0 + .../pmu-events/arch/arm64/arm/neoverse-n1/bus.json | 18 + + .../arch/arm64/arm/neoverse-n1/exception.json | 62 + + .../arch/arm64/arm/neoverse-n1/general.json | 6 + + .../arch/arm64/arm/neoverse-n1/l1d_cache.json | 50 + + .../arch/arm64/arm/neoverse-n1/l1i_cache.json | 10 + + .../arch/arm64/arm/neoverse-n1/l2_cache.json | 46 + + .../arch/arm64/arm/neoverse-n1/l3_cache.json | 18 + + .../arch/arm64/arm/neoverse-n1/ll_cache.json | 10 + + .../arch/arm64/arm/neoverse-n1/memory.json | 22 + + .../arch/arm64/arm/neoverse-n1/metrics.json | 219 + + .../arch/arm64/arm/neoverse-n1/retired.json | 26 + + .../pmu-events/arch/arm64/arm/neoverse-n1/spe.json | 18 + + .../arch/arm64/arm/neoverse-n1/spec_operation.json | 102 + + .../arch/arm64/arm/neoverse-n1/stall.json | 10 + + .../pmu-events/arch/arm64/arm/neoverse-n1/tlb.json | 66 + + tools/perf/pmu-events/arch/arm64/mapfile.csv | 4 +- + .../perf/pmu-events/arch/powerpc/power9/other.json | 4 +- + .../pmu-events/arch/powerpc/power9/pipeline.json | 2 +- + .../pmu-events/arch/s390/cf_z13/transaction.json | 70 + + .../pmu-events/arch/s390/cf_z14/transaction.json | 65 + + .../pmu-events/arch/s390/cf_z15/transaction.json | 65 + + .../perf/pmu-events/arch/s390/cf_z16/extended.json | 10 +- + .../perf/pmu-events/arch/s390/cf_z16/pai_ext.json | 178 + + .../pmu-events/arch/s390/cf_z16/transaction.json | 65 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 3230 +- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 36 +- + .../arch/x86/alderlake/floating-point.json | 27 + + .../pmu-events/arch/x86/alderlake/frontend.json | 9 + + .../perf/pmu-events/arch/x86/alderlake/memory.json | 11 +- + .../perf/pmu-events/arch/x86/alderlake/other.json | 3 +- + .../pmu-events/arch/x86/alderlake/pipeline.json | 28 +- + .../arch/x86/alderlake/uncore-interconnect.json | 90 + + .../arch/x86/alderlake/uncore-memory.json | 16 +- + .../arch/x86/alderlake/uncore-other.json | 64 - + .../arch/x86/alderlaken/adln-metrics.json | 825 +- + .../pmu-events/arch/x86/alderlaken/memory.json | 7 + + .../arch/x86/alderlaken/uncore-interconnect.json | 26 + + .../arch/x86/alderlaken/uncore-memory.json | 16 +- + .../arch/x86/alderlaken/uncore-other.json | 24 - + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 1439 +- + .../perf/pmu-events/arch/x86/broadwell/cache.json | 296 +- + .../arch/x86/broadwell/floating-point.json | 7 + + .../pmu-events/arch/x86/broadwell/frontend.json | 18 +- + .../perf/pmu-events/arch/x86/broadwell/memory.json | 248 +- + .../pmu-events/arch/x86/broadwell/pipeline.json | 22 +- + .../arch/x86/broadwell/uncore-cache.json | 30 +- + .../arch/x86/broadwell/uncore-interconnect.json | 61 + + .../arch/x86/broadwell/uncore-other.json | 59 - + .../arch/x86/broadwellde/bdwde-metrics.json | 1405 +- + .../pmu-events/arch/x86/broadwellde/cache.json | 105 +- + .../arch/x86/broadwellde/floating-point.json | 45 +- + .../pmu-events/arch/x86/broadwellde/frontend.json | 18 +- + .../pmu-events/arch/x86/broadwellde/memory.json | 64 +- + .../pmu-events/arch/x86/broadwellde/pipeline.json | 79 +- + .../arch/x86/broadwellde/uncore-cache.json | 396 +- + .../arch/x86/broadwellde/uncore-interconnect.json | 614 + + .../{uncore-other.json => uncore-io.json} | 595 +- + .../arch/x86/broadwellde/uncore-memory.json | 256 +- + .../arch/x86/broadwellde/uncore-power.json | 10 +- + .../arch/x86/broadwellx/bdx-metrics.json | 1626 +- + .../perf/pmu-events/arch/x86/broadwellx/cache.json | 16 +- + .../pmu-events/arch/x86/broadwellx/frontend.json | 18 +- + .../pmu-events/arch/x86/broadwellx/pipeline.json | 20 +- + .../arch/x86/broadwellx/uncore-cache.json | 456 +- + .../arch/x86/broadwellx/uncore-interconnect.json | 4305 ++- + .../pmu-events/arch/x86/broadwellx/uncore-io.json | 555 + + .../arch/x86/broadwellx/uncore-memory.json | 522 +- + .../arch/x86/broadwellx/uncore-other.json | 3250 -- + .../arch/x86/broadwellx/uncore-power.json | 10 +- + .../pmu-events/arch/x86/cascadelakex/cache.json | 24 +- + .../arch/x86/cascadelakex/clx-metrics.json | 2204 +- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 8 +- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 16 + + .../arch/x86/cascadelakex/uncore-cache.json | 10764 ++++++ + .../arch/x86/cascadelakex/uncore-interconnect.json | 11334 +++++++ + .../arch/x86/cascadelakex/uncore-io.json | 4250 +++ + .../arch/x86/cascadelakex/uncore-memory.json | 18 +- + .../arch/x86/cascadelakex/uncore-other.json | 26336 --------------- + .../arch/x86/cascadelakex/uncore-power.json | 8 +- + .../perf/pmu-events/arch/x86/grandridge/cache.json | 155 + + .../pmu-events/arch/x86/grandridge/frontend.json | 16 + + .../pmu-events/arch/x86/grandridge/memory.json | 20 + + .../perf/pmu-events/arch/x86/grandridge/other.json | 20 + + .../pmu-events/arch/x86/grandridge/pipeline.json | 96 + + .../arch/x86/grandridge/virtual-memory.json | 24 + + .../pmu-events/arch/x86/graniterapids/cache.json | 54 + + .../arch/x86/graniterapids/frontend.json | 10 + + .../pmu-events/arch/x86/graniterapids/memory.json | 174 + + .../pmu-events/arch/x86/graniterapids/other.json | 29 + + .../arch/x86/graniterapids/pipeline.json | 102 + + .../arch/x86/graniterapids/virtual-memory.json | 26 + + tools/perf/pmu-events/arch/x86/haswell/cache.json | 38 +- + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 1220 +- + tools/perf/pmu-events/arch/x86/haswell/memory.json | 38 +- + .../perf/pmu-events/arch/x86/haswell/pipeline.json | 8 + + .../pmu-events/arch/x86/haswell/uncore-cache.json | 50 +- + .../arch/x86/haswell/uncore-interconnect.json | 52 + + .../pmu-events/arch/x86/haswell/uncore-other.json | 50 - + tools/perf/pmu-events/arch/x86/haswellx/cache.json | 2 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 1397 +- + .../pmu-events/arch/x86/haswellx/pipeline.json | 8 + + .../pmu-events/arch/x86/haswellx/uncore-cache.json | 376 +- + .../arch/x86/haswellx/uncore-interconnect.json | 4242 ++- + .../pmu-events/arch/x86/haswellx/uncore-io.json | 528 + + .../pmu-events/arch/x86/haswellx/uncore-other.json | 3160 -- + tools/perf/pmu-events/arch/x86/icelake/cache.json | 16 + + .../arch/x86/icelake/floating-point.json | 31 + + .../pmu-events/arch/x86/icelake/icl-metrics.json | 1932 +- + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 23 +- + .../arch/x86/icelake/uncore-interconnect.json | 74 + + .../pmu-events/arch/x86/icelake/uncore-other.json | 16 - + tools/perf/pmu-events/arch/x86/icelakex/cache.json | 8 + + .../arch/x86/icelakex/floating-point.json | 31 + + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 2153 +- + .../pmu-events/arch/x86/icelakex/pipeline.json | 10 + + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 9860 ++++++ + .../arch/x86/icelakex/uncore-interconnect.json | 14571 ++++++++ + .../pmu-events/arch/x86/icelakex/uncore-io.json | 9270 +++++ + .../arch/x86/icelakex/uncore-memory.json | 6 +- + .../pmu-events/arch/x86/icelakex/uncore-other.json | 33727 ------------------- + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 1270 +- + .../pmu-events/arch/x86/ivybridge/pipeline.json | 8 + + .../arch/x86/ivybridge/uncore-cache.json | 50 +- + ...{uncore-other.json => uncore-interconnect.json} | 0 + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 1311 +- + .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 8 + + .../pmu-events/arch/x86/ivytown/uncore-cache.json | 314 +- + .../arch/x86/ivytown/uncore-interconnect.json | 2025 +- + .../pmu-events/arch/x86/ivytown/uncore-io.json | 549 + + .../pmu-events/arch/x86/ivytown/uncore-other.json | 2174 -- + tools/perf/pmu-events/arch/x86/jaketown/cache.json | 6 +- + .../arch/x86/jaketown/floating-point.json | 2 +- + .../pmu-events/arch/x86/jaketown/frontend.json | 12 +- + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 602 +- + .../pmu-events/arch/x86/jaketown/pipeline.json | 10 +- + .../pmu-events/arch/x86/jaketown/uncore-cache.json | 216 +- + .../arch/x86/jaketown/uncore-interconnect.json | 1311 +- + .../pmu-events/arch/x86/jaketown/uncore-io.json | 324 + + .../arch/x86/jaketown/uncore-memory.json | 4 +- + .../pmu-events/arch/x86/jaketown/uncore-other.json | 1393 - + .../pmu-events/arch/x86/jaketown/uncore-power.json | 8 +- + .../pmu-events/arch/x86/knightslanding/cache.json | 94 +- + .../arch/x86/knightslanding/pipeline.json | 8 +- + .../{uncore-other.json => uncore-cache.json} | 304 +- + .../arch/x86/knightslanding/uncore-io.json | 194 + + .../arch/x86/knightslanding/uncore-memory.json | 106 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 47 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 8 + + .../pmu-events/arch/x86/meteorlake/frontend.json | 9 + + .../pmu-events/arch/x86/meteorlake/memory.json | 13 +- + .../perf/pmu-events/arch/x86/meteorlake/other.json | 4 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 36 +- + .../arch/x86/meteorlake/virtual-memory.json | 4 + + .../pmu-events/arch/x86/sandybridge/cache.json | 8 +- + .../arch/x86/sandybridge/floating-point.json | 2 +- + .../pmu-events/arch/x86/sandybridge/frontend.json | 12 +- + .../pmu-events/arch/x86/sandybridge/pipeline.json | 10 +- + .../arch/x86/sandybridge/snb-metrics.json | 601 +- + .../arch/x86/sandybridge/uncore-cache.json | 50 +- + ...{uncore-other.json => uncore-interconnect.json} | 0 + .../pmu-events/arch/x86/sapphirerapids/cache.json | 24 +- + .../arch/x86/sapphirerapids/floating-point.json | 32 + + .../arch/x86/sapphirerapids/frontend.json | 8 + + .../pmu-events/arch/x86/sapphirerapids/other.json | 3 +- + .../arch/x86/sapphirerapids/pipeline.json | 23 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 2293 +- + .../arch/x86/sapphirerapids/uncore-cache.json | 5644 ++++ + .../arch/x86/sapphirerapids/uncore-cxl.json | 450 + + .../x86/sapphirerapids/uncore-interconnect.json | 6199 ++++ + .../arch/x86/sapphirerapids/uncore-io.json | 3651 ++ + .../arch/x86/sapphirerapids/uncore-memory.json | 3283 +- + .../arch/x86/sapphirerapids/uncore-other.json | 4465 --- + .../arch/x86/sapphirerapids/uncore-power.json | 107 + + .../pmu-events/arch/x86/sierraforest/cache.json | 155 + + .../pmu-events/arch/x86/sierraforest/frontend.json | 16 + + .../pmu-events/arch/x86/sierraforest/memory.json | 20 + + .../pmu-events/arch/x86/sierraforest/other.json | 20 + + .../pmu-events/arch/x86/sierraforest/pipeline.json | 96 + + .../arch/x86/sierraforest/virtual-memory.json | 24 + + .../pmu-events/arch/x86/silvermont/frontend.json | 2 +- + .../pmu-events/arch/x86/silvermont/pipeline.json | 2 +- + tools/perf/pmu-events/arch/x86/skylake/cache.json | 17 +- + .../arch/x86/skylake/floating-point.json | 15 + + .../perf/pmu-events/arch/x86/skylake/frontend.json | 8 +- + tools/perf/pmu-events/arch/x86/skylake/other.json | 1 + + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 26 + + .../pmu-events/arch/x86/skylake/skl-metrics.json | 1877 +- + .../pmu-events/arch/x86/skylake/uncore-cache.json | 28 +- + .../arch/x86/skylake/uncore-interconnect.json | 67 + + .../pmu-events/arch/x86/skylake/uncore-other.json | 64 - + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 8 +- + .../pmu-events/arch/x86/skylakex/frontend.json | 8 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 16 + + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 2097 +- + .../pmu-events/arch/x86/skylakex/uncore-cache.json | 10649 ++++++ + .../arch/x86/skylakex/uncore-interconnect.json | 11248 +++++++ + .../pmu-events/arch/x86/skylakex/uncore-io.json | 4250 +++ + .../arch/x86/skylakex/uncore-memory.json | 2 +- + .../pmu-events/arch/x86/skylakex/uncore-other.json | 26135 -------------- + .../pmu-events/arch/x86/skylakex/uncore-power.json | 6 +- + .../arch/x86/snowridgex/uncore-cache.json | 7100 ++++ + .../arch/x86/snowridgex/uncore-interconnect.json | 6016 ++++ + .../pmu-events/arch/x86/snowridgex/uncore-io.json | 8944 +++++ + .../arch/x86/snowridgex/uncore-memory.json | 4 +- + .../arch/x86/snowridgex/uncore-other.json | 22094 ------------ + .../arch/x86/tigerlake/floating-point.json | 31 + + .../pmu-events/arch/x86/tigerlake/pipeline.json | 18 + + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 1942 +- + .../arch/x86/tigerlake/uncore-interconnect.json | 90 + + .../arch/x86/tigerlake/uncore-memory.json | 50 + + .../arch/x86/tigerlake/uncore-other.json | 100 - + .../pmu-events/arch/x86/westmereep-dp/cache.json | 2 +- + .../arch/x86/westmereep-dp/virtual-memory.json | 2 +- + tools/perf/pmu-events/empty-pmu-events.c | 6 +- + tools/perf/pmu-events/jevents.py | 61 +- + tools/perf/pmu-events/metric.py | 8 +- + tools/perf/pmu-events/pmu-events.h | 35 +- + tools/perf/scripts/Build | 4 +- + tools/perf/scripts/python/Perf-Trace-Util/Build | 2 +- + .../perf/scripts/python/Perf-Trace-Util/Context.c | 17 +- + tools/perf/scripts/python/intel-pt-events.py | 8 +- + tools/perf/tests/api-io.c | 39 +- + tools/perf/tests/attr/base-record | 2 +- + tools/perf/tests/attr/base-stat | 2 +- + tools/perf/tests/attr/system-wide-dummy | 2 +- + tools/perf/tests/bpf.c | 1 - + tools/perf/tests/code-reading.c | 76 +- + tools/perf/tests/expand-cgroup.c | 3 +- + tools/perf/tests/expr.c | 7 +- + tools/perf/tests/hists_common.c | 8 +- + tools/perf/tests/hists_cumulate.c | 14 +- + tools/perf/tests/hists_filter.c | 14 +- + tools/perf/tests/hists_link.c | 22 +- + tools/perf/tests/hists_output.c | 12 +- + tools/perf/tests/make | 26 +- + tools/perf/tests/maps.c | 53 +- + tools/perf/tests/mmap-thread-lookup.c | 3 +- + tools/perf/tests/parse-events.c | 37 +- + tools/perf/tests/parse-metric.c | 21 +- + tools/perf/tests/pfm.c | 12 +- + tools/perf/tests/pmu-events.c | 51 +- + tools/perf/tests/pmu.c | 9 +- + .../perf/tests/shell/lib/perf_json_output_lint.py | 3 +- + tools/perf/tests/shell/record_offcpu.sh | 4 +- + tools/perf/tests/shell/stat+csv_output.sh | 58 +- + tools/perf/tests/shell/stat+json_output.sh | 48 +- + tools/perf/tests/symbols.c | 7 +- + tools/perf/tests/vmlinux-kallsyms.c | 50 +- + tools/perf/ui/browsers/annotate.c | 9 +- + tools/perf/ui/browsers/hists.c | 22 +- + tools/perf/ui/browsers/map.c | 4 +- + tools/perf/ui/gtk/annotate.c | 11 +- + tools/perf/ui/gtk/browser.c | 2 +- + tools/perf/ui/gtk/gtk.h | 2 + + tools/perf/ui/gtk/helpline.c | 2 +- + tools/perf/ui/gtk/hists.c | 2 +- + tools/perf/ui/hist.c | 2 +- + tools/perf/ui/setup.c | 19 + + tools/perf/ui/tui/setup.c | 1 - + tools/perf/ui/ui.h | 3 + + tools/perf/util/Build | 19 +- + tools/perf/util/amd-sample-raw.c | 14 +- + tools/perf/util/annotate.c | 82 +- + tools/perf/util/annotate.h | 9 +- + tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 30 +- + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 47 +- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.c | 9 + + .../util/arm-spe-decoder/arm-spe-pkt-decoder.h | 3 + + tools/perf/util/arm-spe.c | 28 +- + tools/perf/util/auxtrace.c | 7 +- + tools/perf/util/block-info.c | 4 +- + tools/perf/util/block-range.c | 6 +- + tools/perf/util/bpf-event.c | 76 +- + tools/perf/util/bpf-filter.c | 197 + + tools/perf/util/bpf-filter.h | 49 + + tools/perf/util/bpf-filter.l | 159 + + tools/perf/util/bpf-filter.y | 78 + + tools/perf/util/bpf-loader.c | 18 - + tools/perf/util/bpf_counter.c | 28 +- + tools/perf/util/bpf_lock_contention.c | 54 +- + tools/perf/util/bpf_skel/.gitignore | 3 +- + tools/perf/util/bpf_skel/lock_contention.bpf.c | 136 +- + tools/perf/util/bpf_skel/lock_data.h | 17 + + tools/perf/util/bpf_skel/sample-filter.h | 27 + + tools/perf/util/bpf_skel/sample_filter.bpf.c | 196 + + tools/perf/util/build-id.c | 2 +- + tools/perf/util/callchain.c | 28 +- + tools/perf/util/cloexec.c | 13 - + tools/perf/util/cpumap.c | 14 +- + tools/perf/util/cpumap.h | 3 + + tools/perf/util/cputopo.c | 14 + + tools/perf/util/cputopo.h | 5 + + tools/perf/util/cs-etm-base.c | 3 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 7 + + tools/perf/util/cs-etm.c | 346 +- + tools/perf/util/cs-etm.h | 14 +- + tools/perf/util/data-convert-json.c | 10 +- + tools/perf/util/db-export.c | 16 +- + tools/perf/util/demangle-cxx.cpp | 49 + + tools/perf/util/demangle-cxx.h | 16 + + tools/perf/util/dlfilter.c | 28 +- + tools/perf/util/dso.c | 6 +- + tools/perf/util/env.c | 2 +- + tools/perf/util/event.c | 29 +- + tools/perf/util/event.h | 3 +- + tools/perf/util/evlist.c | 38 +- + tools/perf/util/evlist.h | 8 +- + tools/perf/util/evsel.c | 39 +- + tools/perf/util/evsel.h | 17 +- + tools/perf/util/evsel_fprintf.c | 4 +- + tools/perf/util/expr.c | 49 +- + tools/perf/util/expr.y | 12 +- + tools/perf/util/ftrace.h | 1 - + tools/perf/util/genelf_debug.c | 46 +- + tools/perf/util/header.c | 3 +- + tools/perf/util/header.h | 2 + + tools/perf/util/hist.c | 49 +- + tools/perf/util/hist.h | 4 + + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 8 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 18 + + .../util/intel-pt-decoder/intel-pt-insn-decoder.h | 2 + + .../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 2 +- + tools/perf/util/intel-pt.c | 63 +- + tools/perf/util/jitdump.c | 7 +- + tools/perf/util/kvm-stat.h | 73 +- + tools/perf/util/lock-contention.h | 10 +- + tools/perf/util/machine.c | 236 +- + tools/perf/util/map.c | 154 +- + tools/perf/util/map.h | 67 +- + tools/perf/util/maps.c | 274 +- + tools/perf/util/maps.h | 64 +- + tools/perf/util/mem-events.c | 90 +- + tools/perf/util/metricgroup.c | 199 +- + tools/perf/util/metricgroup.h | 5 +- + tools/perf/util/ordered-events.c | 2 +- + tools/perf/util/parse-events.c | 295 +- + tools/perf/util/parse-events.h | 15 +- + tools/perf/util/parse-events.l | 1 + + tools/perf/util/parse-events.y | 28 +- + tools/perf/util/pfm.c | 1 - + tools/perf/util/pmu.c | 427 +- + tools/perf/util/pmu.h | 23 +- + tools/perf/util/pmu.l | 17 +- + tools/perf/util/pmu.y | 5 +- + tools/perf/util/print-events.c | 38 +- + tools/perf/util/print-events.h | 1 + + tools/perf/util/probe-event.c | 62 +- + tools/perf/util/python.c | 21 +- + tools/perf/util/record.h | 1 - + tools/perf/util/sample.h | 13 + + tools/perf/util/scripting-engines/Build | 2 +- + .../perf/util/scripting-engines/trace-event-perl.c | 10 +- + .../util/scripting-engines/trace-event-python.c | 101 +- + tools/perf/util/session.c | 5 +- + tools/perf/util/smt.c | 11 +- + tools/perf/util/smt.h | 12 +- + tools/perf/util/sort.c | 124 +- + tools/perf/util/sort.h | 3 + + tools/perf/util/srcline.c | 183 +- + tools/perf/util/stat-display.c | 117 +- + tools/perf/util/stat-shadow.c | 1287 +- + tools/perf/util/stat.c | 74 - + tools/perf/util/stat.h | 96 +- + tools/perf/util/strfilter.c | 2 +- + tools/perf/util/string.c | 2 +- + tools/perf/util/symbol-elf.c | 76 +- + tools/perf/util/symbol.c | 295 +- + tools/perf/util/symbol_conf.h | 2 +- + tools/perf/util/symbol_fprintf.c | 2 +- + tools/perf/util/synthetic-events.c | 36 +- + tools/perf/util/thread-stack.c | 4 +- + tools/perf/util/thread.c | 69 +- + tools/perf/util/top.c | 2 +- + tools/perf/util/topdown.c | 68 +- + tools/perf/util/topdown.h | 11 +- + tools/perf/util/trace-event-scripting.c | 9 +- + tools/perf/util/unwind-libdw.c | 18 +- + tools/perf/util/unwind-libunwind-local.c | 68 +- + tools/perf/util/unwind-libunwind.c | 35 +- + tools/perf/util/usage.c | 6 + + tools/perf/util/util.c | 21 +- + tools/perf/util/util.h | 8 + + tools/perf/util/vdso.c | 7 +- + .../drivers/net/dsa/test_bridge_fdb_stress.sh | 2 +- + 495 files changed, 168375 insertions(+), 145786 deletions(-) + create mode 100644 tools/build/feature/test-cxa-demangle.cpp + delete mode 100644 tools/build/feature/test-libbpf-bpf_map_create.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_map.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_object__next_program.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_prog_load.c + delete mode 100644 tools/build/feature/test-libbpf-bpf_program__set_insns.c + delete mode 100644 tools/build/feature/test-libbpf-btf__load_from_kernel_by_id.c + delete mode 100644 tools/build/feature/test-libbpf-btf__raw_data.c + create mode 100644 tools/build/feature/test-scandirat.c + create mode 100644 tools/perf/arch/s390/util/pmu.c + create mode 100644 tools/perf/bench/pmu-scan.c + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/branch.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/bus.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/cache.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/exception.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/instruction.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/memory.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{cortex-a76-n1 => cortex-a76}/pipeline.json (100%) + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/general.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l1d_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l1i_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l2_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/l3_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/ll_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/metrics.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/retired.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/spe.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/spec_operation.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/stall.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n1/tlb.json + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z16/pai_ext.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/uncore-interconnect.json + rename tools/perf/pmu-events/arch/x86/broadwellde/{uncore-other.json => uncore-io.json} (54%) + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/haswellx/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/icelakex/uncore-other.json + rename tools/perf/pmu-events/arch/x86/ivybridge/{uncore-other.json => uncore-interconnect.json} (100%) + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/ivytown/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/jaketown/uncore-other.json + rename tools/perf/pmu-events/arch/x86/knightslanding/{uncore-other.json => uncore-cache.json} (90%) + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-io.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json + rename tools/perf/pmu-events/arch/x86/sandybridge/{uncore-other.json => uncore-interconnect.json} (100%) + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-cxl.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-io.json + delete mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/tigerlake/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/tigerlake/uncore-memory.json + create mode 100644 tools/perf/util/bpf-filter.c + create mode 100644 tools/perf/util/bpf-filter.h + create mode 100644 tools/perf/util/bpf-filter.l + create mode 100644 tools/perf/util/bpf-filter.y + create mode 100644 tools/perf/util/bpf_skel/sample-filter.h + create mode 100644 tools/perf/util/bpf_skel/sample_filter.bpf.c + create mode 100644 tools/perf/util/demangle-cxx.cpp + create mode 100644 tools/perf/util/demangle-cxx.h +Merging compiler-attributes/compiler-attributes (eeac8ede17557 Linux 6.3-rc2) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (b31507dcaf356 dma-debug: Use %pa to format phys_addr_t) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'recursive' strategy. + kernel/dma/debug.c | 131 +++++++++++++++++++++++++++------------------------- + kernel/dma/direct.c | 15 +++--- + 2 files changed, 76 insertions(+), 70 deletions(-) +Merging asm-generic/master (5e98654e30e18 Merge branch 'asm-generic-fixes' into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging fs/eventpoll.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/ia64/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/Kconfig | 1 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/ia64/Kconfig | 1 + + arch/loongarch/Kconfig | 1 + + arch/m68k/Kconfig | 1 + + arch/microblaze/Kconfig | 1 + + arch/mips/Kconfig | 1 + + arch/parisc/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/riscv/Kconfig | 1 + + arch/sh/Kconfig | 1 + + arch/sparc/Kconfig | 1 + + arch/x86/Kconfig | 1 + + drivers/block/pktcdvd.c | 13 +++++++++---- + drivers/bus/Kconfig | 2 +- + drivers/parisc/Kconfig | 1 + + fs/eventpoll.c | 13 +++++++++++++ + include/linux/hw_breakpoint.h | 10 ++++++++++ + include/uapi/linux/atmdev.h | 4 ---- + include/uapi/linux/eventpoll.h | 12 ------------ + include/uapi/linux/hw_breakpoint.h | 10 ---------- + include/uapi/linux/pktcdvd.h | 11 ----------- + lib/Kconfig | 4 ++++ + net/atm/svc.c | 5 +++++ + scripts/headers_install.sh | 4 ---- + tools/include/uapi/linux/hw_breakpoint.h | 10 ---------- + 27 files changed, 57 insertions(+), 56 deletions(-) +Merging arc/for-next (f2906aa863381 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (60261442c1b91 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/compressed/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arm64/for-next/core (6d0fe66e14e42 Merge branch 'for-next/mm' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging samples/Kconfig +Auto-merging mm/kfence/core.c +Auto-merging kernel/trace/ftrace.c +CONFLICT (content): Merge conflict in kernel/trace/ftrace.c +Auto-merging include/linux/ftrace.h +Auto-merging include/linux/cpuhotplug.h +Auto-merging arch/arm64/include/asm/uaccess.h +Auto-merging arch/arm64/include/asm/memory.h +Auto-merging arch/arm64/Kconfig +Resolved 'kernel/trace/ftrace.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 227d1b72ec1f5] Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/pmu.yaml | 2 + + arch/arm/include/asm/arm_pmuv3.h | 247 ++++++++++++ + arch/arm/mm/Kconfig | 2 +- + arch/arm64/Kconfig | 4 + + arch/arm64/include/asm/arm_pmuv3.h | 155 ++++++++ + arch/arm64/include/asm/atomic_lse.h | 17 +- + arch/arm64/include/asm/barrier.h | 10 +- + arch/arm64/include/asm/compat.h | 4 - + arch/arm64/include/asm/fixmap.h | 22 +- + arch/arm64/include/asm/ftrace.h | 22 + + arch/arm64/include/asm/kernel-pgtable.h | 5 +- + arch/arm64/include/asm/kexec.h | 6 - + arch/arm64/include/asm/kfence.h | 10 + + arch/arm64/include/asm/memory.h | 5 - + arch/arm64/include/asm/mmu.h | 2 + + arch/arm64/include/asm/perf_event.h | 249 ------------ + arch/arm64/include/asm/sysreg.h | 8 - + arch/arm64/include/asm/uaccess.h | 6 +- + arch/arm64/kernel/Makefile | 1 - + arch/arm64/kernel/armv8_deprecated.c | 4 +- + arch/arm64/kernel/asm-offsets.c | 6 + + arch/arm64/kernel/entry-ftrace.S | 90 ++++- + arch/arm64/kernel/ftrace.c | 46 ++- + arch/arm64/kernel/idreg-override.c | 2 +- + arch/arm64/kernel/machine_kexec.c | 22 +- + arch/arm64/kernel/stacktrace.c | 142 ++++--- + arch/arm64/lib/uaccess_flushcache.c | 6 - + arch/arm64/mm/Makefile | 2 +- + arch/arm64/mm/dma-mapping.c | 17 +- + arch/arm64/mm/fixmap.c | 203 ++++++++++ + arch/arm64/mm/init.c | 34 +- + arch/arm64/mm/mmu.c | 288 +++----------- + arch/arm64/mm/pageattr.c | 7 +- + arch/arm64/mm/ptdump.c | 2 +- + arch/arm64/tools/gen-sysreg.awk | 95 +++-- + arch/arm64/tools/sysreg | 100 ++++- + arch/s390/kernel/mcount.S | 5 + + arch/x86/kernel/ftrace_32.S | 5 + + arch/x86/kernel/ftrace_64.S | 4 + + drivers/firmware/arm_sdei.c | 37 +- + drivers/perf/Kconfig | 10 + + drivers/perf/Makefile | 1 + + drivers/perf/alibaba_uncore_drw_pmu.c | 3 +- + drivers/perf/amlogic/meson_ddr_pmu_core.c | 8 +- + drivers/perf/apple_m1_cpu_pmu.c | 15 +- + drivers/perf/arm-cmn.c | 4 +- + drivers/perf/arm_cspmu/arm_cspmu.c | 6 +- + drivers/perf/arm_dmc620_pmu.c | 3 +- + .../perf_event.c => drivers/perf/arm_pmuv3.c | 158 +++----- + drivers/perf/qcom_l3_pmu.c | 3 +- + include/kvm/arm_pmu.h | 2 +- + include/linux/cpuhotplug.h | 1 - + include/linux/ftrace.h | 61 +-- + include/linux/perf/arm_pmuv3.h | 303 ++++++++++++++ + kernel/bpf/trampoline.c | 12 +- + kernel/trace/Kconfig | 2 +- + kernel/trace/ftrace.c | 441 ++------------------- + kernel/trace/trace_selftest.c | 19 +- + mm/kfence/core.c | 4 + + samples/Kconfig | 2 +- + samples/ftrace/ftrace-direct-modify.c | 10 +- + samples/ftrace/ftrace-direct-multi-modify.c | 9 +- + samples/ftrace/ftrace-direct-multi.c | 5 +- + samples/ftrace/ftrace-direct-too.c | 10 +- + samples/ftrace/ftrace-direct.c | 10 +- + 65 files changed, 1619 insertions(+), 1377 deletions(-) + create mode 100644 arch/arm/include/asm/arm_pmuv3.h + create mode 100644 arch/arm64/include/asm/arm_pmuv3.h + create mode 100644 arch/arm64/mm/fixmap.c + rename arch/arm64/kernel/perf_event.c => drivers/perf/arm_pmuv3.c (92%) + create mode 100644 include/linux/perf/arm_pmuv3.h +Merging arm-perf/for-next/perf (a30b87e6bd7db arm64: pmuv3: dynamically map PERF_COUNT_HW_BRANCH_INSTRUCTIONS) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (e770a08d1404f soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Removing arch/arm64/boot/dts/renesas/r8a77950.dtsi +Removing arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts +Removing arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts +Removing arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts +Removing arch/arm/mach-oxnas/platsmp.c +Removing arch/arm/mach-oxnas/headsmp.S +Removing arch/arm/mach-oxnas/Makefile +Removing arch/arm/mach-oxnas/Kconfig +CONFLICT (modify/delete): arch/arm/configs/oxnas_v6_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/oxnas_v6_defconfig left in tree. +Removing arch/arm/boot/dts/ox820.dtsi +Removing arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts +Removing arch/arm/boot/dts/ox810se.dtsi +Removing arch/arm/boot/dts/ox810se-wd-mbwe.dts +Auto-merging arch/arm/Kconfig +Removing Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt +Removing Documentation/devicetree/bindings/arm/oxnas.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/configs/oxnas_v6_defconfig +rm 'arch/arm/configs/oxnas_v6_defconfig' +$ git commit --no-edit -v -a +[master b3989cae5ecd5] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/amlogic.yaml | 10 + + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 4 +- + .../arm/amlogic/amlogic,meson-mx-secbus2.yaml | 4 +- + .../bindings/arm/firmware/linaro,optee-tz.yaml | 3 +- + Documentation/devicetree/bindings/arm/oxnas.txt | 14 - + .../bindings/memory-controllers/renesas,dbsc.yaml | 4 +- + .../memory-controllers/renesas,rpc-if.yaml | 2 +- + .../memory-controllers/samsung,exynos5422-dmc.yaml | 6 +- + .../bindings/soc/amlogic/amlogic,canvas.yaml | 4 +- + .../soc/amlogic/amlogic,meson-gx-clk-measure.yaml | 40 + + .../bindings/soc/amlogic/clk-measure.txt | 21 - + .../devicetree/bindings/soc/renesas/renesas.yaml | 15 +- + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/staging/tee.rst | 53 ++ + arch/arm/Kconfig | 2 - + arch/arm/Makefile | 1 - + arch/arm/arm-soc-for-next-contents.txt | 83 ++ + arch/arm/boot/dts/Makefile | 11 +- + arch/arm/boot/dts/am335x-pcm-953.dtsi | 24 +- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 10 +- + arch/arm/boot/dts/am335x-regor.dtsi | 18 +- + arch/arm/boot/dts/am335x-wega.dtsi | 57 +- + arch/arm/boot/dts/am571x-idk-touchscreen.dtso | 32 + + arch/arm/boot/dts/am572x-idk-touchscreen.dtso | 32 + + arch/arm/boot/dts/am57xx-evm.dtso | 127 +++ + arch/arm/boot/dts/am57xx-idk-lcd-osd101t2045.dtso | 63 ++ + arch/arm/boot/dts/am57xx-idk-lcd-osd101t2587.dtso | 66 ++ + arch/arm/boot/dts/armada-388-db.dts | 2 +- + arch/arm/boot/dts/at91-sam9x60ek.dts | 3 +- + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 3 +- + arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi | 3 +- + arch/arm/boot/dts/at91-sama5d2_icp.dts | 3 +- + arch/arm/boot/dts/da850-evm.dts | 2 +- + arch/arm/boot/dts/dove.dtsi | 2 +- + arch/arm/boot/dts/hi3620-hi4511.dts | 12 +- + arch/arm/boot/dts/hip04-d01.dts | 2 +- + arch/arm/boot/dts/intel-ixp42x-adi-coyote.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-arcom-vulcan.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts | 2 +- + arch/arm/boot/dts/intel-ixp42x-freecom-fsg-3.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-gateway-7001.dts | 6 +- + .../arm/boot/dts/intel-ixp42x-gateworks-gw2348.dts | 6 +- + .../arm/boot/dts/intel-ixp42x-goramo-multilink.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts | 4 +- + arch/arm/boot/dts/intel-ixp42x-ixdp425.dts | 4 +- + arch/arm/boot/dts/intel-ixp42x-ixdpg425.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts | 4 +- + arch/arm/boot/dts/intel-ixp42x-linksys-wrv54g.dts | 6 +- + arch/arm/boot/dts/intel-ixp42x-netgear-wg302v1.dts | 4 +- + .../arm/boot/dts/intel-ixp42x-welltech-epbx100.dts | 2 +- + .../arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts | 6 +- + arch/arm/boot/dts/intel-ixp43x-kixrp435.dts | 4 +- + .../boot/dts/intel-ixp4xx-reference-design.dtsi | 2 +- + arch/arm/boot/dts/keystone-k2e-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2hk-evm.dts | 2 +- + arch/arm/boot/dts/keystone-k2l-evm.dts | 2 +- + arch/arm/boot/dts/meson8.dtsi | 17 + + arch/arm/boot/dts/meson8b.dtsi | 4 +- + arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 48 +- + arch/arm/boot/dts/omap-zoom-common.dtsi | 8 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 19 +- + arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 2 +- + arch/arm/boot/dts/omap3-igep0020.dts | 2 +- + arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 2 +- + arch/arm/boot/dts/omap3-igep0030.dts | 2 +- + arch/arm/boot/dts/omap3-lilly-dbb056.dts | 2 +- + arch/arm/boot/dts/omap3-n9.dts | 2 +- + arch/arm/boot/dts/omap3-n950.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-alto35.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-gallop43.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-palo35.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-palo43.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-summit.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-tobi.dts | 2 +- + arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts | 2 +- + arch/arm/boot/dts/omap3-pandora-1ghz.dts | 2 +- + arch/arm/boot/dts/omap3-sbc-t3730.dts | 2 +- + arch/arm/boot/dts/omap3-sniper.dts | 2 +- + arch/arm/boot/dts/omap3-zoom3.dts | 2 +- + arch/arm/boot/dts/ox810se-wd-mbwe.dts | 115 --- + arch/arm/boot/dts/ox810se.dtsi | 357 -------- + .../dts/ox820-cloudengines-pogoplug-series-3.dts | 93 --- + arch/arm/boot/dts/ox820.dtsi | 299 ------- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 19 +- + arch/arm/common/locomo.c | 6 +- + arch/arm/common/sa1111.c | 6 +- + arch/arm/common/scoop.c | 6 +- + arch/arm/configs/multi_v7_defconfig | 6 + + arch/arm/configs/oxnas_v6_defconfig | 92 --- + arch/arm/configs/shmobile_defconfig | 2 + + arch/arm/mach-imx/mmdc.c | 5 +- + arch/arm/mach-mmp/Kconfig | 6 - + arch/arm/mach-mstar/Kconfig | 7 - + arch/arm/mach-omap1/Kconfig | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 6 +- + arch/arm/mach-omap1/omap-dma.c | 6 +- + arch/arm/mach-omap2/Kconfig | 11 - + arch/arm/mach-omap2/cm33xx.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 23 +- + arch/arm/mach-omap2/pm33xx-core.c | 6 +- + arch/arm/mach-oxnas/Kconfig | 38 - + arch/arm/mach-oxnas/Makefile | 2 - + arch/arm/mach-oxnas/headsmp.S | 23 - + arch/arm/mach-oxnas/platsmp.c | 96 --- + arch/arm/mach-pxa/sharpsl_pm.c | 6 +- + arch/arm/mach-sa1100/jornada720_ssp.c | 5 +- + arch/arm/mach-sa1100/neponset.c | 6 +- + arch/arm/mach-spear/Kconfig | 6 - + arch/arm64/boot/dts/amlogic/Makefile | 3 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 10 + + .../dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 1 - + .../dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts | 37 + + .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 165 ++++ + .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 388 +++++++++ + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 521 ++++++++++++ + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 6 +- + .../dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts | 14 + + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 82 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +- + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 29 +- + .../dts/amlogic/meson-gxm-s912-libretech-pc.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 2 +- + .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +- + arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 3 +- + arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 4 +- + arch/arm64/boot/dts/marvell/armada-ap810-ap0.dtsi | 2 +- + arch/arm64/boot/dts/renesas/Makefile | 5 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 - + .../arm64/boot/dts/renesas/r8a77950-salvator-x.dts | 49 -- + arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts | 16 - + arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts | 37 - + arch/arm64/boot/dts/renesas/r8a77950.dtsi | 330 -------- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 1 - + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 - + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 2 - + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 - + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 8 + + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 1 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 3 - + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 11 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 17 +- + .../r8a779g0-white-hawk-ard-audio-da7212.dtso | 187 +++++ + .../dts/renesas/r8a779g0-white-hawk-csi-dsi.dtsi | 172 ++++ + .../arm64/boot/dts/renesas/r8a779g0-white-hawk.dts | 44 + + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 880 +++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a779m1.dtsi | 3 + + arch/arm64/boot/dts/renesas/r8a779m3.dtsi | 3 + + arch/arm64/boot/dts/renesas/r8a779m5.dtsi | 3 + + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 19 +- + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 13 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 32 +- + arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi | 7 - + arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi | 7 - + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 32 +- + arch/arm64/boot/dts/renesas/r9a07g054l1.dtsi | 7 - + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 216 +++++ + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 45 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 6 + + arch/arm64/boot/dts/sprd/Makefile | 3 +- + arch/arm64/boot/dts/sprd/ums512-1h10.dts | 61 ++ + arch/arm64/boot/dts/sprd/ums512.dtsi | 911 +++++++++++++++++++++ + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 2 +- + arch/arm64/configs/defconfig | 7 +- + arch/arm64/configs/virt.config | 21 + + drivers/bus/ti-sysc.c | 53 +- + drivers/firmware/meson/meson_sm.c | 5 +- + drivers/memory/Kconfig | 2 +- + drivers/memory/atmel-ebi.c | 2 +- + drivers/memory/bt1-l2-ctl.c | 1 - + drivers/memory/da8xx-ddrctl.c | 1 - + drivers/memory/fsl_ifc.c | 1 - + drivers/memory/mvebu-devbus.c | 1 - + drivers/memory/tegra/mc.c | 1 - + drivers/memory/tegra/tegra186-emc.c | 1 - + drivers/memory/tegra/tegra210-emc-table.c | 2 - + drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 8 +- + drivers/soc/renesas/Kconfig | 7 - + drivers/soc/renesas/pwc-rzv2m.c | 2 +- + drivers/soc/renesas/r8a7795-sysc.c | 10 - + drivers/soc/renesas/renesas-soc.c | 14 +- + drivers/soc/renesas/rmobile-sysc.c | 2 +- + drivers/tee/optee/Kconfig | 17 + + drivers/tee/optee/optee_msg.h | 12 + + drivers/tee/optee/optee_private.h | 24 + + drivers/tee/optee/optee_smc.h | 24 + + drivers/tee/optee/smc_abi.c | 259 +++++- + include/dt-bindings/power/r8a7795-sysc.h | 1 - + 195 files changed, 5068 insertions(+), 2073 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/oxnas.txt + create mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am571x-idk-touchscreen.dtso + create mode 100644 arch/arm/boot/dts/am572x-idk-touchscreen.dtso + create mode 100644 arch/arm/boot/dts/am57xx-evm.dtso + create mode 100644 arch/arm/boot/dts/am57xx-idk-lcd-osd101t2045.dtso + create mode 100644 arch/arm/boot/dts/am57xx-idk-lcd-osd101t2587.dtso + delete mode 100644 arch/arm/boot/dts/ox810se-wd-mbwe.dts + delete mode 100644 arch/arm/boot/dts/ox810se.dtsi + delete mode 100644 arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts + delete mode 100644 arch/arm/boot/dts/ox820.dtsi + delete mode 100644 arch/arm/configs/oxnas_v6_defconfig + delete mode 100644 arch/arm/mach-oxnas/Kconfig + delete mode 100644 arch/arm/mach-oxnas/Makefile + delete mode 100644 arch/arm/mach-oxnas/headsmp.S + delete mode 100644 arch/arm/mach-oxnas/platsmp.c + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts + delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts + delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts + delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts + delete mode 100644 arch/arm64/boot/dts/renesas/r8a77950.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ard-audio-da7212.dtso + create mode 100644 arch/arm64/boot/dts/sprd/ums512-1h10.dts + create mode 100644 arch/arm64/boot/dts/sprd/ums512.dtsi +Merging amlogic/for-next (ae68fb187b59b Merge branch 'v6.4/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging asahi-soc/asahi-soc/for-next (f41aba1578192 Merge branch 'asahi-soc/dt' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/apple.yaml | 15 + + .../devicetree/bindings/arm/apple/apple,pmgr.yaml | 1 + + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../devicetree/bindings/clock/apple,nco.yaml | 1 + + .../devicetree/bindings/i2c/apple,i2c.yaml | 1 + + .../bindings/interrupt-controller/apple,aic2.yaml | 22 +- + .../devicetree/bindings/iommu/apple,sart.yaml | 10 +- + .../devicetree/bindings/mailbox/apple,mailbox.yaml | 2 + + .../devicetree/bindings/nvme/apple,nvme-ans.yaml | 5 +- + .../devicetree/bindings/pci/apple,pcie.yaml | 1 + + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 1 + + .../bindings/power/apple,pmgr-pwrstate.yaml | 1 + + .../devicetree/bindings/watchdog/apple,wdt.yaml | 1 + + arch/arm64/boot/dts/apple/Makefile | 3 + + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 4 + + arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 11 - + arch/arm64/boot/dts/apple/t600x-j375.dtsi | 11 + + arch/arm64/boot/dts/apple/t8103-j274.dts | 10 + + arch/arm64/boot/dts/apple/t8103-j293.dts | 15 - + arch/arm64/boot/dts/apple/t8103-j313.dts | 15 - + arch/arm64/boot/dts/apple/t8103-j456.dts | 10 + + arch/arm64/boot/dts/apple/t8103-j457.dts | 11 +- + arch/arm64/boot/dts/apple/t8103.dtsi | 4 + + arch/arm64/boot/dts/apple/t8112-j413.dts | 63 ++ + arch/arm64/boot/dts/apple/t8112-j473.dts | 54 + + arch/arm64/boot/dts/apple/t8112-j493.dts | 52 + + arch/arm64/boot/dts/apple/t8112-jxxx.dtsi | 81 ++ + arch/arm64/boot/dts/apple/t8112-pmgr.dtsi | 1140 ++++++++++++++++++++ + arch/arm64/boot/dts/apple/t8112.dtsi | 912 ++++++++++++++++ + drivers/soc/apple/rtkit.c | 16 +- + 30 files changed, 2417 insertions(+), 58 deletions(-) + create mode 100644 arch/arm64/boot/dts/apple/t8112-j413.dts + create mode 100644 arch/arm64/boot/dts/apple/t8112-j473.dts + create mode 100644 arch/arm64/boot/dts/apple/t8112-j493.dts + create mode 100644 arch/arm64/boot/dts/apple/t8112-jxxx.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t8112-pmgr.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t8112.dtsi +Merging aspeed/for-next (7d4f0b0df7c5e ARM: dts: aspeed-g6: Add UDMA node) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts | 37 ++++++++++++++- + arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts | 6 ++- + arch/arm/boot/dts/aspeed-bmc-asrock-romed8hm3.dts | 4 +- + .../boot/dts/aspeed-bmc-facebook-greatlakes.dts | 53 ++++++++++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts | 24 +++------- + arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 6 +++ + arch/arm/boot/dts/aspeed-g6.dtsi | 9 ++++ + 7 files changed, 118 insertions(+), 21 deletions(-) +Merging at91/at91-next (ad5125686a4f1 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'recursive' strategy. + drivers/clk/microchip/Kconfig | 4 ++-- + drivers/clk/microchip/clk-pic32mzda.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging broadcom/next (89ec1caa5e4a1 Merge branch 'soc/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Removing drivers/soc/bcm/brcmstb/pm/s2-arm.S +Removing drivers/soc/bcm/brcmstb/pm/pm-arm.c +Removing drivers/soc/bcm/brcmstb/pm/aon_defs.h +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/bcm47622.dtsi | 18 + + arch/arm/boot/dts/bcm63138.dtsi | 18 + + arch/arm/boot/dts/bcm63148.dtsi | 18 + + arch/arm/boot/dts/bcm63178.dtsi | 19 + + arch/arm/boot/dts/bcm6756.dtsi | 19 + + arch/arm/boot/dts/bcm6846.dtsi | 18 + + arch/arm/boot/dts/bcm6855.dtsi | 19 + + arch/arm/boot/dts/bcm6878.dtsi | 19 + + arch/arm/boot/dts/bcm947622.dts | 4 + + arch/arm/boot/dts/bcm963138.dts | 4 + + arch/arm/boot/dts/bcm963138dvt.dts | 4 + + arch/arm/boot/dts/bcm963148.dts | 4 + + arch/arm/boot/dts/bcm963178.dts | 4 + + arch/arm/boot/dts/bcm96756.dts | 4 + + arch/arm/boot/dts/bcm96846.dts | 4 + + arch/arm/boot/dts/bcm96855.dts | 4 + + arch/arm/boot/dts/bcm96878.dts | 4 + + arch/arm/mach-bcm/bcm_kona_smc.c | 23 +- + .../dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts | 4 + + .../bcmbca/bcm4906-tplink-archer-c2300-v1.dts | 6 +- + .../dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts | 10 +- + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 61 +- + arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 20 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 19 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 19 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 20 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 18 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 18 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts | 4 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 4 + + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- + drivers/bus/brcmstb_gisb.c | 4 +- + drivers/soc/bcm/bcm2835-power.c | 1 - + drivers/soc/bcm/brcmstb/Kconfig | 4 +- + drivers/soc/bcm/brcmstb/pm/Makefile | 1 - + drivers/soc/bcm/brcmstb/pm/aon_defs.h | 105 --- + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 874 --------------------- + drivers/soc/bcm/brcmstb/pm/s2-arm.S | 69 -- + drivers/soc/bcm/raspberrypi-power.c | 1 - + 44 files changed, 408 insertions(+), 1083 deletions(-) + delete mode 100644 drivers/soc/bcm/brcmstb/pm/aon_defs.h + delete mode 100644 drivers/soc/bcm/brcmstb/pm/pm-arm.c + delete mode 100644 drivers/soc/bcm/brcmstb/pm/s2-arm.S +Merging davinci/davinci/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (3ec0e1ea4770e memory: mtk-smi: mt8365: Add SMI Support) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/memory-controllers/mediatek,smi-common.yaml | 2 ++ + .../devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml | 4 ++++ + drivers/memory/mtk-smi.c | 6 ++++++ + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 2 +- + 4 files changed, 13 insertions(+), 1 deletion(-) +Merging imx-mxs/for-next (159d28f666990 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging drivers/bus/imx-weim.c +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 45 +- + .../bindings/soc/imx/fsl,imx8mm-disp-blk-ctrl.yaml | 2 +- + .../bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml | 2 +- + .../bindings/soc/imx/fsl,imx8mn-disp-blk-ctrl.yaml | 2 +- + .../bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 2 +- + .../soc/imx/fsl,imx8mp-media-blk-ctrl.yaml | 53 +- + .../bindings/soc/imx/fsl,imx8mq-vpu-blk-ctrl.yaml | 2 +- + .../bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/Makefile | 9 + + arch/arm/boot/dts/imx28-apf28.dts | 96 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 312 ++-- + arch/arm/boot/dts/imx28-apx4devkit.dts | 380 +++-- + arch/arm/boot/dts/imx28-cfa10036.dts | 193 ++- + arch/arm/boot/dts/imx28-cfa10049.dts | 454 +++--- + arch/arm/boot/dts/imx28-cfa10055.dts | 224 ++- + arch/arm/boot/dts/imx28-cfa10056.dts | 146 +- + arch/arm/boot/dts/imx28-cfa10057.dts | 252 ++-- + arch/arm/boot/dts/imx28-cfa10058.dts | 186 ++- + arch/arm/boot/dts/imx28-duckbill-2-485.dts | 174 +-- + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 198 +-- + arch/arm/boot/dts/imx28-duckbill-2-spi.dts | 211 +-- + arch/arm/boot/dts/imx28-duckbill-2.dts | 256 ++-- + arch/arm/boot/dts/imx28-duckbill.dts | 196 ++- + arch/arm/boot/dts/imx28-evk.dts | 462 +++--- + arch/arm/boot/dts/imx28-m28.dtsi | 44 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 354 +++-- + arch/arm/boot/dts/imx28-m28evk.dts | 420 +++--- + arch/arm/boot/dts/imx28-sps1.dts | 201 ++- + arch/arm/boot/dts/imx28-ts4600.dts | 80 +- + arch/arm/boot/dts/imx28-tx28.dts | 38 +- + arch/arm/boot/dts/imx6dl-alti6p.dts | 12 +- + arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 13 +- + arch/arm/boot/dts/imx6dl-lanmcu.dts | 12 +- + arch/arm/boot/dts/imx6dl-plybas.dts | 12 +- + arch/arm/boot/dts/imx6dl-plym2m.dts | 12 +- + arch/arm/boot/dts/imx6dl-prtmvt.dts | 11 +- + arch/arm/boot/dts/imx6dl-victgo.dts | 12 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 9 +- + arch/arm/boot/dts/imx6dl-yapp4-lynx.dts | 58 + + arch/arm/boot/dts/imx6dl-yapp4-phoenix.dts | 42 + + arch/arm/boot/dts/imx6dl-yapp43-common.dtsi | 615 ++++++++ + arch/arm/boot/dts/imx6q-prtwd2.dts | 17 +- + arch/arm/boot/dts/imx6q-yapp4-pegasus.dts | 58 + + arch/arm/boot/dts/imx6qdl-skov-cpu.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl.dtsi | 4 +- + arch/arm/boot/dts/imx6qp-yapp4-pegasus-plus.dts | 58 + + arch/arm/boot/dts/imx6sl-tolino-vision.dts | 490 +++++++ + arch/arm/boot/dts/imx6ul-prti6g.dts | 14 +- + arch/arm/boot/dts/imx6ul.dtsi | 10 +- + arch/arm/boot/dts/imx6ull-tarragon-common.dtsi | 852 +++++++++++ + arch/arm/boot/dts/imx6ull-tarragon-master.dts | 82 ++ + arch/arm/boot/dts/imx6ull-tarragon-micro.dts | 10 + + arch/arm/boot/dts/imx6ull-tarragon-slave.dts | 32 + + arch/arm/boot/dts/imx6ull-tarragon-slavext.dts | 64 + + arch/arm/boot/dts/imx7d-remarkable2.dts | 239 ++++ + arch/arm/boot/dts/imx7d.dtsi | 9 + + arch/arm/configs/imx_v4_v5_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 12 + + arch/arm/mach-imx/gpc.c | 2 +- + arch/arm/mach-imx/mach-imx6q.c | 10 +- + arch/arm/mach-imx/mach-imx6ul.c | 20 - + arch/arm/mach-mxs/mach-mxs.c | 2 +- + arch/arm64/boot/dts/freescale/Makefile | 10 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 2 +- + .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi | 144 ++ + .../boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 220 +++ + .../boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 270 ++++ + .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 1484 ++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 69 + + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 76 +- + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 48 + + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 4 +- + .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 13 + + arch/arm64/boot/dts/freescale/imx8mm-prt8mm.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 79 ++ + .../dts/freescale/imx8mn-bsh-smm-s2-common.dtsi | 6 +- + .../arm64/boot/dts/freescale/imx8mn-bsh-smm-s2.dts | 2 +- + .../boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 55 + + .../dts/freescale/imx8mp-data-modul-edm-sbc.dts | 977 +++++++++++++ + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 59 + + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 30 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts | 306 ++++ + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 52 +- + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 2 + + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 9 +- + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 9 +- + .../boot/dts/freescale/imx8mp-verdin-wifi.dtsi | 5 + + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 135 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r2.dts | 12 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 2 +- + .../boot/dts/freescale/imx8mq-librem5-r3.dtsi | 10 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r4.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 79 +- + .../boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 2 - + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 40 + + .../boot/dts/freescale/imx8qm-apalis-eval.dts | 16 + + .../dts/freescale/imx8qm-apalis-ixora-v1.1.dts | 16 + + .../boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts | 16 + + .../freescale/imx8qm-apalis-v1.1-ixora-v1.1.dts | 16 + + .../freescale/imx8qm-apalis-v1.1-ixora-v1.2.dts | 16 + + .../boot/dts/freescale/imx8qm-apalis-v1.1.dtsi | 16 + + arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi | 340 +++++ + arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 44 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 4 + + .../boot/dts/freescale/imx8qxp-colibri-aster.dts | 16 + + .../boot/dts/freescale/imx8qxp-colibri-eval-v3.dts | 6 +- + .../dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 62 - + .../boot/dts/freescale/imx8qxp-colibri-iris-v2.dts | 16 + + .../boot/dts/freescale/imx8qxp-colibri-iris.dts | 16 + + arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi | 592 +------- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 87 +- + .../boot/dts/freescale/imx8x-colibri-aster.dtsi | 44 + + .../boot/dts/freescale/imx8x-colibri-eval-v3.dtsi | 90 ++ + .../boot/dts/freescale/imx8x-colibri-iris-v2.dtsi | 45 + + .../boot/dts/freescale/imx8x-colibri-iris.dtsi | 115 ++ + arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 776 ++++++++++ + arch/arm64/boot/dts/freescale/imx93.dtsi | 47 + + arch/arm64/configs/defconfig | 1 + + drivers/bus/imx-weim.c | 19 +- + drivers/firmware/imx/imx-scu.c | 5 +- + drivers/firmware/imx/scu-pd.c | 4 + + drivers/soc/imx/Kconfig | 2 +- + drivers/soc/imx/imx8m-blk-ctrl.c | 11 +- + drivers/soc/imx/imx8mp-blk-ctrl.c | 5 +- + drivers/soc/imx/soc-imx8m.c | 1 + + 137 files changed, 10920 insertions(+), 3590 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-lynx.dts + create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-phoenix.dts + create mode 100644 arch/arm/boot/dts/imx6dl-yapp43-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-yapp4-pegasus.dts + create mode 100644 arch/arm/boot/dts/imx6qp-yapp4-pegasus-plus.dts + create mode 100644 arch/arm/boot/dts/imx6sl-tolino-vision.dts + create mode 100644 arch/arm/boot/dts/imx6ull-tarragon-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-tarragon-master.dts + create mode 100644 arch/arm/boot/dts/imx6ull-tarragon-micro.dts + create mode 100644 arch/arm/boot/dts/imx6ull-tarragon-slave.dts + create mode 100644 arch/arm/boot/dts/imx6ull-tarragon-slavext.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-ixora-v1.1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-ixora-v1.1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-ixora-v1.2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri-aster.dts + delete mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri-iris-v2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-colibri-iris.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8x-colibri-aster.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8x-colibri-iris-v2.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8x-colibri-iris.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi +Merging mediatek/for-next (e586dd4471725 Merge branch 'v6.3-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'recursive' strategy. + .../bindings/soc/mediatek/mediatek,mutex.yaml | 22 +- + arch/arm/boot/dts/mt2701.dtsi | 2 +- + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 6 + + arch/arm64/boot/dts/mediatek/Makefile | 1 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt6357.dtsi | 282 +++++++++ + .../boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 166 ++++++ + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 182 ++++++ + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 6 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 17 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 17 +- + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 17 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 34 +- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 17 + + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 24 +- + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 116 +++- + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 29 + + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 633 ++++++++++++++++++++- + arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 183 ++++++ + arch/arm64/boot/dts/mediatek/mt8365.dtsi | 488 ++++++++++++++++ + drivers/soc/mediatek/Kconfig | 1 + + drivers/soc/mediatek/mt8173-mmsys.h | 95 ++++ + drivers/soc/mediatek/mt8195-mmsys.h | 13 + + drivers/soc/mediatek/mtk-mmsys.c | 195 ++++--- + drivers/soc/mediatek/mtk-mmsys.h | 2 +- + drivers/soc/mediatek/mtk-mutex.c | 218 ++++--- + drivers/soc/mediatek/mtk-svs.c | 149 ++--- + include/linux/soc/mediatek/mtk-cmdq.h | 114 ++++ + include/linux/soc/mediatek/mtk-mmsys.h | 6 + + include/linux/soc/mediatek/mtk-mutex.h | 35 ++ + 32 files changed, 2784 insertions(+), 292 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt6357.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8365-evk.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8365.dtsi + create mode 100644 drivers/soc/mediatek/mt8173-mmsys.h +Merging mvebu/for-next (12845aa04754a Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-370-rd.dts | 2 +- + arch/arm/boot/dts/armada-381-netgear-gs110emx.dts | 2 +- + arch/arm/boot/dts/armada-385-clearfog-gtr-l8.dts | 7 +- + arch/arm/boot/dts/armada-385-clearfog-gtr-s4.dts | 7 +- + arch/arm/boot/dts/armada-385-linksys.dtsi | 2 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 2 - + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 2 +- + arch/arm/boot/dts/kirkwood-dir665.dts | 3 +- + arch/arm/boot/dts/kirkwood-l-50.dts | 2 +- + arch/arm/boot/dts/kirkwood-linksys-viper.dts | 3 +- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 3 +- + arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 2 +- + arch/arm/boot/dts/orion5x-netgear-wnr854t.dts | 7 +- + arch/arm64/boot/dts/marvell/Makefile | 1 + + .../boot/dts/marvell/armada-3720-gl-mv1000.dts | 239 +++++++++++++++++++++ + .../boot/dts/marvell/armada-7040-mochabin.dts | 1 + + arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 10 +- + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +- + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 3 +- + drivers/firmware/turris-mox-rwtm.c | 2 +- + 20 files changed, 280 insertions(+), 22 deletions(-) + create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts +Merging omap/for-next (c45167f4f5cfd Merge branch 'omap-for-v6.4/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging qcom/for-next (8358703a007ea Merge branches 'arm64-defconfig-for-6.4', 'arm64-fixes-for-6.3', 'arm64-for-6.4', 'clk-for-6.4', 'drivers-fixes-for-6.3', 'drivers-for-6.4', 'dts-fixes-for-6.3' and 'dts-for-6.4' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-inx.dts +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-boe.dts +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev1-boe.dts +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev1-auo.dts +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0-boe.dts +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0-auo.dts +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts +Removing arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt +Removing Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/msm/qcom,kpss-acc.txt | 49 - + .../devicetree/bindings/arm/msm/qcom,kpss-gcc.txt | 44 - + .../devicetree/bindings/arm/msm/qcom,llcc.yaml | 129 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 36 + + .../devicetree/bindings/clock/qcom,a53pll.yaml | 1 + + .../bindings/clock/qcom,gcc-ipq4019.yaml | 53 + + .../bindings/clock/qcom,gcc-msm8909.yaml | 13 +- + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 2 - + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 + + .../bindings/clock/qcom,ipq5332-gcc.yaml | 53 + + .../bindings/clock/qcom,ipq9574-gcc.yaml | 61 + + .../bindings/clock/qcom,kpss-acc-v1.yaml | 72 + + .../devicetree/bindings/clock/qcom,kpss-gcc.yaml | 88 + + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 + + .../bindings/clock/qcom,sc7280-lpasscc.yaml | 7 + + .../bindings/clock/qcom,sm6115-gpucc.yaml | 58 + + .../bindings/clock/qcom,sm6125-gpucc.yaml | 64 + + .../bindings/clock/qcom,sm6375-gpucc.yaml | 60 + + .../devicetree/bindings/clock/qcom,sm7150-gcc.yaml | 52 + + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 42 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 7 + + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 9 +- + .../bindings/pinctrl/qcom,tlmm-common.yaml | 4 +- + .../bindings/power/qcom,kpss-acc-v2.yaml | 42 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 9 +- + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 2 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 3 + + .../devicetree/bindings/sram/qcom,imem.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 6 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 27 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 8 +- + arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi | 27 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 15 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 24 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 2 +- + arch/arm/boot/dts/qcom-msm8226.dtsi | 6 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 2 +- + arch/arm/boot/dts/qcom-msm8960.dtsi | 13 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 10 +- + arch/arm/boot/dts/qcom-sdx55-t55.dts | 50 +- + arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 21 +- + arch/arm/boot/dts/qcom-sdx55.dtsi | 178 +- + arch/arm/boot/dts/qcom-sdx65-mtp.dts | 11 +- + arch/arm/boot/dts/qcom-sdx65.dtsi | 47 +- + arch/arm64/boot/dts/qcom/Makefile | 22 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 17 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 65 +- + arch/arm64/boot/dts/qcom/ipq5332-mi01.2.dts | 89 + + arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 103 + + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 387 ++ + arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 1 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 4 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 4 +- + arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi | 4 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 +- + arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts | 84 + + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 270 ++ + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 12 +- + .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 12 +- + arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 12 +- + arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 12 +- + arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 12 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 12 +- + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 12 +- + arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 22 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 4 - + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 8 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 14 +- + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 8 + + .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 16 +- + .../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 12 +- + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 16 +- + arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts | 3 + + arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 12 +- + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 12 +- + .../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts | 35 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 16 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 481 ++- + .../boot/dts/qcom/msm8956-sony-xperia-loire.dtsi | 4 + + arch/arm64/boot/dts/qcom/msm8976.dtsi | 13 +- + arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 5 - + .../dts/qcom/msm8994-huawei-angler-rev-101.dts | 11 +- + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 5 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 8 +- + .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 67 +- + arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts | 6 + + arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts | 6 + + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 62 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 48 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 5 +- + .../boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 2 +- + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 1 - + .../dts/qcom/msm8998-sony-xperia-yoshino-maple.dts | 179 +- + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 266 +- + arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 3 - + arch/arm64/boot/dts/qcom/msm8998.dtsi | 8 +- + arch/arm64/boot/dts/qcom/pm2250.dtsi | 63 + + arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm660l.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 6 + + arch/arm64/boot/dts/qcom/pm8550b.dtsi | 6 + + arch/arm64/boot/dts/qcom/pm8916.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 - + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 1561 +++++++ + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 1 - + arch/arm64/boot/dts/qcom/qcs404.dtsi | 7 +- + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 21 +- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 112 + + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 227 ++ + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 5 + + arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi | 211 + + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 431 ++ + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 981 +++++ + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 20 +- + .../boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts | 38 - + .../boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts | 17 - + ...ngoftown.dtsi => sc7180-trogdor-kingoftown.dts} | 10 +- + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts | 2 +- + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 34 - + .../dts/qcom/sc7180-trogdor-mrbland-rev0-auo.dts | 22 - + .../dts/qcom/sc7180-trogdor-mrbland-rev0-boe.dts | 22 - + .../boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi | 36 - + .../dts/qcom/sc7180-trogdor-mrbland-rev1-auo.dts | 22 - + .../dts/qcom/sc7180-trogdor-mrbland-rev1-boe.dts | 24 - + .../boot/dts/qcom/sc7180-trogdor-mrbland.dtsi | 320 -- + .../boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 2 +- + .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 1 + + .../dts/qcom/sc7180-trogdor-quackingstick.dtsi | 11 +- + .../qcom/sc7180-trogdor-wormdingler-rev0-boe.dts | 22 - + .../qcom/sc7180-trogdor-wormdingler-rev0-inx.dts | 22 - + .../dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi | 36 - + .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi | 11 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 41 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 29 +- + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 25 +- + arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 2 +- + .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 2 + + .../dts/qcom/sc7280-herobrine-audio-rt5682.dtsi | 2 + + arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 2 +- + .../boot/dts/qcom/sc7280-herobrine-villager.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 2 - + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 19 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 60 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 27 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 151 +- + arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 23 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 107 +- + .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 2 +- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 42 +- + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 1 - + arch/arm64/boot/dts/qcom/sdm670.dtsi | 109 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 45 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 5 - + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 45 +- + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 1 - + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 7 +- + .../dts/qcom/sdm845-sony-xperia-tama-akari.dts | 4 + + .../dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts | 47 +- + .../dts/qcom/sdm845-sony-xperia-tama-apollo.dts | 6 + + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 199 +- + arch/arm64/boot/dts/qcom/sdm845-wcd9340.dtsi | 1 - + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 14 +- + .../dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 4 - + arch/arm64/boot/dts/qcom/sdm845.dtsi | 129 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 9 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 4 +- + .../arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 19 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 280 +- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 46 +- + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 1 - + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 421 ++ + arch/arm64/boot/dts/qcom/sm6125.dtsi | 68 +- + .../dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 3 - + arch/arm64/boot/dts/qcom/sm6350.dtsi | 15 +- + .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 27 + + arch/arm64/boot/dts/qcom/sm6375.dtsi | 916 ++++- + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 5 + + .../boot/dts/qcom/sm8150-microsoft-surface-duo.dts | 1 - + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 5 + + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 88 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 4 +- + .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 2 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 3 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-boe.dts | 18 + + ...i-elish.dts => sm8250-xiaomi-elish-common.dtsi} | 83 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-csot.dts | 18 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 257 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 47 +- + .../dts/qcom/sm8350-microsoft-surface-duo2.dts | 3 + + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 1 - + arch/arm64/boot/dts/qcom/sm8350.dtsi | 172 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 56 +- + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 1 - + .../boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi | 1 - + arch/arm64/boot/dts/qcom/sm8450.dtsi | 192 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 62 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 439 ++ + arch/arm64/boot/dts/qcom/sm8550.dtsi | 425 +- + arch/arm64/configs/defconfig | 22 +- + drivers/clk/qcom/Kconfig | 70 + + drivers/clk/qcom/Makefile | 8 + + drivers/clk/qcom/apcs-msm8916.c | 6 +- + drivers/clk/qcom/apcs-sdx55.c | 6 +- + drivers/clk/qcom/apss-ipq-pll.c | 116 +- + drivers/clk/qcom/clk-alpha-pll.c | 139 +- + drivers/clk/qcom/clk-alpha-pll.h | 14 +- + drivers/clk/qcom/clk-branch.c | 15 +- + drivers/clk/qcom/clk-branch.h | 44 + + drivers/clk/qcom/clk-hfpll.c | 14 +- + drivers/clk/qcom/clk-krait.c | 10 +- + drivers/clk/qcom/clk-rpm.c | 11 +- + drivers/clk/qcom/clk-smd-rpm.c | 37 + + drivers/clk/qcom/dispcc-qcm2290.c | 10 +- + drivers/clk/qcom/gcc-ipq4019.c | 1665 ++++---- + drivers/clk/qcom/gcc-ipq5332.c | 3824 ++++++++++++++++++ + drivers/clk/qcom/gcc-ipq9574.c | 4248 ++++++++++++++++++++ + drivers/clk/qcom/gcc-msm8917.c | 3303 +++++++++++++++ + drivers/clk/qcom/gcc-msm8960.c | 6 +- + drivers/clk/qcom/gcc-msm8996.c | 3 +- + drivers/clk/qcom/gcc-msm8998.c | 3 +- + drivers/clk/qcom/gcc-qcm2290.c | 3 +- + drivers/clk/qcom/gcc-sm6115.c | 50 +- + drivers/clk/qcom/gcc-sm6375.c | 3 +- + drivers/clk/qcom/gcc-sm7150.c | 3048 ++++++++++++++ + drivers/clk/qcom/gcc-sm8350.c | 47 +- + drivers/clk/qcom/gpucc-sa8775p.c | 625 +++ + drivers/clk/qcom/gpucc-sm6115.c | 503 +++ + drivers/clk/qcom/gpucc-sm6125.c | 424 ++ + drivers/clk/qcom/gpucc-sm6375.c | 458 +++ + drivers/clk/qcom/lpassaudiocc-sc7280.c | 2 + + drivers/clk/qcom/lpasscc-sc7280.c | 16 +- + drivers/edac/qcom_edac.c | 64 +- + drivers/firmware/qcom_scm.c | 16 +- + drivers/misc/fastrpc.c | 2 +- + drivers/net/wireless/ath/ath10k/qmi.c | 4 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 36 +- + drivers/remoteproc/qcom_q6v5_mss.c | 8 +- + drivers/remoteproc/qcom_q6v5_pas.c | 2 +- + drivers/soc/qcom/Kconfig | 6 +- + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/icc-bwmon.c | 231 +- + drivers/soc/qcom/ice.c | 366 ++ + drivers/soc/qcom/llcc-qcom.c | 104 +- + drivers/soc/qcom/pmic_glink.c | 65 +- + drivers/soc/qcom/qcom_aoss.c | 2 +- + drivers/soc/qcom/qcom_gsbi.c | 2 +- + drivers/soc/qcom/rmtfs_mem.c | 2 +- + drivers/soc/qcom/rpmh-rsc.c | 2 +- + drivers/soc/qcom/rpmpd.c | 833 ++-- + drivers/soc/qcom/smd-rpm.c | 2 +- + drivers/soc/qcom/smem.c | 4 +- + drivers/soc/qcom/smsm.c | 11 +- + drivers/soc/qcom/socinfo.c | 16 + + include/dt-bindings/arm/qcom,ids.h | 11 + + include/dt-bindings/clock/qcom,dispcc-qcm2290.h | 4 + + include/dt-bindings/clock/qcom,gcc-msm8917.h | 190 + + include/dt-bindings/clock/qcom,ipq5332-gcc.h | 356 ++ + include/dt-bindings/clock/qcom,ipq9574-gcc.h | 213 + + include/dt-bindings/clock/qcom,sa8775p-gpucc.h | 50 + + include/dt-bindings/clock/qcom,sm6115-gpucc.h | 36 + + include/dt-bindings/clock/qcom,sm6125-gpucc.h | 31 + + include/dt-bindings/clock/qcom,sm6375-gpucc.h | 36 + + include/dt-bindings/clock/qcom,sm7150-gcc.h | 186 + + include/dt-bindings/firmware/qcom,scm.h | 2 + + include/dt-bindings/reset/qcom,ipq9574-gcc.h | 164 + + include/linux/firmware/qcom/qcom_scm.h | 2 +- + include/linux/soc/qcom/geni-se.h | 42 +- + include/linux/soc/qcom/llcc-qcom.h | 6 +- + include/soc/qcom/ice.h | 37 + + 281 files changed, 31885 insertions(+), 3150 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt + delete mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-ipq4019.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,ipq5332-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,ipq9574-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,kpss-acc-v1.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,kpss-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6115-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6125-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6375-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml + create mode 100644 Documentation/devicetree/bindings/power/qcom,kpss-acc-v2.yaml + create mode 100644 arch/arm64/boot/dts/qcom/ipq5332-mi01.2.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5332.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq9574.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts + create mode 100644 arch/arm64/boot/dts/qcom/pm2250.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcm2290.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qrb2210-rb1.dts + create mode 100644 arch/arm64/boot/dts/qcom/qrb4210-rb2.dts + create mode 100644 arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sa8775p-ride.dts + create mode 100644 arch/arm64/boot/dts/qcom/sa8775p.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dts + rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-kingoftown.dtsi => sc7180-trogdor-kingoftown.dts} (95%) + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0-auo.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0-boe.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev1-auo.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev1-boe.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-boe.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-inx.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-boe.dts + rename arch/arm64/boot/dts/qcom/{sm8250-xiaomi-elish.dts => sm8250-xiaomi-elish-common.dtsi} (92%) + create mode 100644 arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-csot.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8550-qrd.dts + create mode 100644 drivers/clk/qcom/gcc-ipq5332.c + create mode 100644 drivers/clk/qcom/gcc-ipq9574.c + create mode 100644 drivers/clk/qcom/gcc-msm8917.c + create mode 100644 drivers/clk/qcom/gcc-sm7150.c + create mode 100644 drivers/clk/qcom/gpucc-sa8775p.c + create mode 100644 drivers/clk/qcom/gpucc-sm6115.c + create mode 100644 drivers/clk/qcom/gpucc-sm6125.c + create mode 100644 drivers/clk/qcom/gpucc-sm6375.c + create mode 100644 drivers/soc/qcom/ice.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8917.h + create mode 100644 include/dt-bindings/clock/qcom,ipq5332-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,ipq9574-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sa8775p-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm6115-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm6125-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm6375-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm7150-gcc.h + create mode 100644 include/dt-bindings/reset/qcom,ipq9574-gcc.h + create mode 100644 include/soc/qcom/ice.h +Merging renesas/next (6f03a6e4e947d Merge branches 'renesas-drivers-for-v6.4' and 'renesas-dts-for-v6.4' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/boot/dts/r8a7779-marzen.dts | 69 +++++++++++ + arch/arm/boot/dts/r8a7779.dtsi | 91 ++++++++++++--- + arch/arm/boot/dts/r8a7790.dtsi | 81 +++++++++++++ + arch/arm/mach-shmobile/platsmp-apmu.c | 36 +++--- + arch/arm64/boot/dts/renesas/Makefile | 2 + + .../boot/dts/renesas/r8a779a0-falcon-csi-dsi.dtsi | 5 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 22 ++-- + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 126 +++++++++++++++++++++ + .../boot/dts/renesas/r9a07g043-smarc-pmod.dtso | 45 ++++++++ + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 + + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 81 +++++++++++++ + .../renesas/r9a07g044l2-smarc-cru-csi-ov5645.dtso | 21 ++++ + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 + + .../boot/dts/renesas/rz-smarc-cru-csi-ov5645.dtsi | 80 +++++++++++++ + drivers/soc/renesas/renesas-soc.c | 5 +- + include/dt-bindings/clock/r8a7779-clock.h | 1 + + 18 files changed, 629 insertions(+), 49 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043-smarc-pmod.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2-smarc-cru-csi-ov5645.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rz-smarc-cru-csi-ov5645.dtsi +Merging reset/reset/next (1b929c02afd37 Linux 6.2-rc1) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (6f935ffdb7993 Merge branch 'v6.4-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 24 +- + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 1 + + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 6 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 4 + + arch/arm/boot/dts/rk3288.dtsi | 29 +- + arch/arm64/boot/dts/rockchip/Makefile | 5 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 12 +- + .../boot/dts/rockchip/rk3326-anbernic-rg351m.dts | 2 + + arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi | 2 - + .../boot/dts/rockchip/rk3326-odroid-go2-v11.dts | 2 + + arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 2 + + arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts | 5 +- + arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts | 40 ++ + .../dts/rockchip/rk3328-orangepi-r1-plus-lts.dts | 40 ++ + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 1 - + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 1 - + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 1 - + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 18 +- + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 114 ++++ + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 12 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 22 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353x.dtsi | 64 ++- + .../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 2 +- + .../boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 8 + + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts | 112 ++++ + arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 137 +++++ + .../arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 590 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 8 +- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 97 ++++ + arch/arm64/boot/dts/rockchip/rk3588.dtsi | 68 +++ + .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 37 ++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 212 +++++++- + drivers/clk/rockchip/clk-rk3399.c | 2 +- + 35 files changed, 1629 insertions(+), 59 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +Merging samsung-krzk/for-next (f5391a4705ef3 Merge branch 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/samsung,exynos850-clock.yaml | 19 ++ + .../bindings/soc/samsung/exynos-pmu.yaml | 23 ++- + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 4 + + arch/arm/boot/dts/exynos3250-artik5.dtsi | 6 + + arch/arm/boot/dts/exynos3250-monk.dts | 2 + + arch/arm/boot/dts/exynos3250-rinato.dts | 3 + + arch/arm/boot/dts/exynos3250.dtsi | 14 +- + arch/arm/boot/dts/exynos4.dtsi | 13 +- + arch/arm/boot/dts/exynos4210-i9100.dts | 6 + + arch/arm/boot/dts/exynos4210-origen.dts | 5 + + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 + + arch/arm/boot/dts/exynos4210-trats.dts | 6 + + arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 6 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 5 + + arch/arm/boot/dts/exynos4412-midas.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 6 + + arch/arm/boot/dts/exynos4412-origen.dts | 6 + + arch/arm/boot/dts/exynos4412-p4note.dtsi | 11 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 + + arch/arm/boot/dts/exynos4412-tiny4412.dts | 4 + + arch/arm/boot/dts/exynos4412.dtsi | 3 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 21 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 3 + + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 + + arch/arm/boot/dts/exynos5250-spring.dts | 6 + + arch/arm/boot/dts/exynos5250.dtsi | 28 +-- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 6 + + arch/arm/boot/dts/exynos5410-odroidxu.dts | 3 + + arch/arm/boot/dts/exynos5410-smdk5410.dts | 6 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 + + .../arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 6 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 + + arch/arm/boot/dts/exynos5420-smdk5420.dts | 6 + + arch/arm/boot/dts/exynos5420.dtsi | 27 +-- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 4 + + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 5 + + arch/arm/boot/dts/exynos5422-samsung-k3g.dts | 5 + + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 + + arch/arm/boot/dts/s5pv210.dtsi | 2 +- + arch/arm/mach-exynos/exynos.c | 8 +- + arch/arm/mach-exynos/suspend.c | 2 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 5 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 19 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 5 +- + .../boot/dts/exynos/exynos7885-jackpotlte.dts | 1 + + arch/arm64/boot/dts/exynos/exynos850.dtsi | 9 + + drivers/clk/samsung/clk-exynos-arm64.c | 229 +++++++++++++++++++-- + drivers/clk/samsung/clk-exynos-arm64.h | 3 + + drivers/clk/samsung/clk-exynos-audss.c | 6 +- + drivers/clk/samsung/clk-exynos-clkout.c | 6 +- + drivers/clk/samsung/clk-exynos4.c | 6 +- + drivers/clk/samsung/clk-exynos4412-isp.c | 3 +- + drivers/clk/samsung/clk-exynos5250.c | 5 +- + drivers/clk/samsung/clk-exynos5420.c | 5 +- + drivers/clk/samsung/clk-exynos5433.c | 157 +------------- + drivers/clk/samsung/clk-exynos850.c | 141 ++++++++++++- + drivers/clk/samsung/clk-pll.c | 12 +- + drivers/clk/samsung/clk-pll.h | 1 + + drivers/clk/samsung/clk-s3c64xx.c | 4 +- + drivers/clk/samsung/clk-s5pv210.c | 6 +- + drivers/clk/samsung/clk.c | 64 ++++-- + drivers/clk/samsung/clk.h | 10 +- + include/dt-bindings/clock/exynos850.h | 28 ++- + 64 files changed, 731 insertions(+), 316 deletions(-) +Merging scmi/for-linux-next (78baf6f431e6b Merge branch 'for-next/cacheinfo' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/arm,scmi.yaml | 48 ++++++-- + arch/arm64/kernel/cacheinfo.c | 25 ++++- + drivers/base/arch_topology.c | 11 +- + drivers/base/cacheinfo.c | 124 ++++++++++++++++----- + drivers/bus/vexpress-config.c | 2 +- + drivers/firmware/arm_scmi/driver.c | 2 +- + drivers/firmware/arm_scmi/mailbox.c | 95 ++++++++++++++-- + include/linux/cacheinfo.h | 8 ++ + 8 files changed, 257 insertions(+), 58 deletions(-) +Merging stm32/stm32-next (49f1d0b65f876 ARM: stm32: add initial documentation for STM32MP151) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'recursive' strategy. + Documentation/arm/index.rst | 1 + + Documentation/arm/stm32/stm32mp151-overview.rst | 36 ++++++ + arch/arm/boot/dts/stm32mp13-pinctrl.dtsi | 129 ++++++++++++++++++++ + arch/arm/boot/dts/stm32mp131.dtsi | 145 ++++++++++++++++++++++- + arch/arm/boot/dts/stm32mp135f-dk.dts | 42 ++++++- + arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 34 +++--- + arch/arm/boot/dts/stm32mp157a-dk1.dts | 3 - + arch/arm/boot/dts/stm32mp157c-dk2.dts | 3 - + arch/arm/boot/dts/stm32mp157c-ed1.dts | 17 +-- + arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 9 -- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 9 +- + arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts | 2 +- + arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi | 10 -- + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 15 +-- + arch/arm/boot/dts/stm32mp15xx-osd32.dtsi | 4 +- + arch/arm/mach-stm32/board-dt.c | 1 + + 16 files changed, 386 insertions(+), 74 deletions(-) + create mode 100644 Documentation/arm/stm32/stm32mp151-overview.rst +Merging sunxi/sunxi/for-next (7081db38231a4 Merge branch 'sunxi/dt-for-6.4' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 18 +++ + Documentation/devicetree/bindings/riscv/sunxi.yaml | 5 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm/boot/dts/Makefile | 5 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 12 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 10 +- + .../arm/boot/dts/sun8i-t113s-mangopi-mq-r-t113.dts | 35 ++++++ + arch/arm/boot/dts/sun8i-t113s.dtsi | 59 ++++++++++ + arch/arm/boot/dts/sun8i-v3s.dtsi | 6 +- + arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts | 16 +++ + arch/arm/boot/dts/suniv-f1c100s.dtsi | 32 ++++++ + arch/arm/boot/dts/suniv-f1c200s-lctech-pi.dts | 76 +++++++++++++ + arch/arm/boot/dts/suniv-f1c200s-popstick-v1.1.dts | 81 +++++++++++++ + arch/arm/boot/dts/sunxi-d1s-t113-mangopi-mq-r.dtsi | 126 +++++++++++++++++++++ + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 8 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 1 + + arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 72 ++++++++++++ + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 24 +++- + drivers/soc/sunxi/sunxi_mbus.c | 2 +- + drivers/soc/sunxi/sunxi_sram.c | 1 - + scripts/dtc/include-prefixes/riscv | 1 + + 21 files changed, 567 insertions(+), 27 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-t113s-mangopi-mq-r-t113.dts + create mode 100644 arch/arm/boot/dts/sun8i-t113s.dtsi + create mode 100644 arch/arm/boot/dts/suniv-f1c200s-lctech-pi.dts + create mode 100644 arch/arm/boot/dts/suniv-f1c200s-popstick-v1.1.dts + create mode 100644 arch/arm/boot/dts/sunxi-d1s-t113-mangopi-mq-r.dtsi + create mode 120000 scripts/dtc/include-prefixes/riscv +Merging tee/next (cf1773f935d8f Merge branch 'optee_load-for-v6.4' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (7947eeb21f005 Merge branch for-6.4/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/nvidia/tegra234.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra194.dtsi +Merge made by the 'recursive' strategy. + .../bindings/arm/nvidia,tegra194-ccplex.yaml | 6 +- + Documentation/devicetree/bindings/arm/tegra.yaml | 9 + + .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 6 +- + .../arm/tegra/nvidia,tegra194-axi2apb.yaml | 4 +- + .../bindings/arm/tegra/nvidia,tegra194-cbb.yaml | 8 +- + .../bindings/arm/tegra/nvidia,tegra234-cbb.yaml | 4 +- + .../bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml | 4 +- + .../bindings/gpu/host1x/nvidia,tegra210-nvenc.yaml | 4 +- + .../bindings/gpu/host1x/nvidia,tegra210-nvjpg.yaml | 4 +- + .../bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml | 4 +- + arch/arm/boot/dts/tegra20-asus-tf101.dts | 19 +- + arch/arm/boot/dts/tegra30-asus-tf201.dts | 17 ++ + arch/arm/boot/dts/tegra30-asus-tf300t.dts | 6 +- + arch/arm/boot/dts/tegra30-asus-tf300tg.dts | 17 ++ + arch/arm/boot/dts/tegra30-asus-tf700t.dts | 17 ++ + .../boot/dts/tegra30-asus-transformer-common.dtsi | 9 +- + arch/arm/boot/dts/tegra30-peripherals-opp.dtsi | 20 ++ + arch/arm/boot/dts/tegra30.dtsi | 5 +- + arch/arm64/boot/dts/nvidia/Makefile | 2 + + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 8 - + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 - + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 4 - + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 8 - + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 123 ++++++++++- + .../arm64/boot/dts/nvidia/tegra234-p3767-0000.dtsi | 14 ++ + arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi | 172 +++++++++++++++ + .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts | 134 +++++++++++ + .../arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi | 245 +++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 20 +- + arch/arm64/configs/defconfig | 1 + + drivers/amba/tegra-ahb.c | 1 - + drivers/firmware/arm_scmi/optee.c | 2 +- + drivers/firmware/tegra/bpmp-debugfs.c | 12 +- + drivers/firmware/tegra/bpmp.c | 6 +- + drivers/soc/tegra/cbb/tegra-cbb.c | 1 - + drivers/soc/tegra/cbb/tegra194-cbb.c | 6 +- + drivers/soc/tegra/cbb/tegra234-cbb.c | 8 - + drivers/soc/tegra/flowctrl.c | 4 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 4 +- + drivers/soc/tegra/pmc.c | 26 ++- + drivers/soc/tegra/powergate-bpmp.c | 2 +- + 42 files changed, 871 insertions(+), 98 deletions(-) + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3767-0000.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi +Merging ti/ti-next (a8fccb83f3e25 Merge branches 'ti-drivers-soc-next', 'ti-k3-config-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 2 + + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 1 - + arch/arm64/boot/dts/ti/Makefile | 8 +- + arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 231 +++++++ + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 109 ++- + arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 11 + + arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 21 + + arch/arm64/boot/dts/ti/k3-am62.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 758 +++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 244 +------ + arch/arm64/boot/dts/ti/k3-am625.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62a.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 5 +- + arch/arm64/boot/dts/ti/k3-am62a7.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 351 ++++++++++ + arch/arm64/boot/dts/ti/k3-am64.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 12 +- + .../dts/ti/k3-j7200-evm-quad-port-eth-exp.dtso | 101 +++ + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 176 +++++ + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 33 + + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 3 +- + .../dts/ti/k3-j721e-evm-quad-port-eth-exp.dtso | 133 ++++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 205 +++++- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 33 + + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 4 - + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 4 +- + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 44 ++ + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 88 +++ + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 73 ++ + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 59 ++ + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 108 +++ + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 34 + + arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-pinctrl.h | 53 ++ + arch/arm64/configs/defconfig | 10 + + drivers/soc/ti/k3-ringacc.c | 7 + + drivers/soc/ti/k3-socinfo.c | 1 + + drivers/soc/ti/knav_dma.c | 4 +- + drivers/soc/ti/knav_qmss_acc.c | 2 +- + drivers/soc/ti/knav_qmss_queue.c | 4 +- + drivers/soc/ti/omap_prm.c | 2 +- + drivers/soc/ti/pm33xx.c | 5 +- + drivers/soc/ti/wkup_m3_ipc.c | 6 +- + include/dt-bindings/pinctrl/k3.h | 7 + + 46 files changed, 2701 insertions(+), 273 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j7200-evm-quad-port-eth-exp.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-evm-quad-port-eth-exp.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-pinctrl.h +Merging xilinx/for-next (ec1696c3440f1 Merge remote-tracking branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 3 +++ + arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 ++++ + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 12 ++++++++++++ + drivers/soc/xilinx/zynqmp_power.c | 4 ++-- + 13 files changed, 54 insertions(+), 2 deletions(-) +Merging clk/clk-next (5883d6b83cb0c Merge branch 'clk-starfive' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Removing drivers/reset/reset-starfive-jh7100.c +Removing drivers/clk/starfive/clk-starfive-jh7100.h +Removing drivers/clk/loongson1/clk.h +Removing drivers/clk/loongson1/clk.c +Removing drivers/clk/loongson1/clk-loongson1c.c +Removing drivers/clk/loongson1/clk-loongson1b.c +Removing drivers/clk/loongson1/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/clock/brcm,bcm63268-timer-clocks.yaml | 40 + + .../devicetree/bindings/clock/imx8mp-audiomix.yaml | 79 ++ + .../bindings/clock/loongson,ls1x-clk.yaml | 45 + + .../bindings/clock/mediatek,mt8186-fhctl.yaml | 7 +- + .../bindings/clock/mediatek,mt8188-clock.yaml | 71 + + .../bindings/clock/mediatek,mt8188-sys-clock.yaml | 55 + + .../devicetree/bindings/clock/renesas,9series.yaml | 6 + + .../bindings/clock/skyworks,si521xx.yaml | 59 + + .../bindings/clock/starfive,jh7110-aoncrg.yaml | 107 ++ + .../bindings/clock/starfive,jh7110-syscrg.yaml | 104 ++ + MAINTAINERS | 25 +- + arch/mips/include/asm/mach-loongson32/platform.h | 1 - + arch/mips/loongson32/common/time.c | 3 +- + drivers/clk/Kconfig | 28 + + drivers/clk/Makefile | 7 +- + drivers/clk/at91/clk-sam9x60-pll.c | 2 +- + drivers/clk/axs10x/i2s_pll_clock.c | 5 +- + drivers/clk/axs10x/pll_clock.c | 11 +- + drivers/clk/bcm/Kconfig | 9 + + drivers/clk/bcm/Makefile | 1 + + drivers/clk/bcm/clk-bcm2711-dvp.c | 6 +- + drivers/clk/bcm/clk-bcm63268-timer.c | 216 ++++ + drivers/clk/bcm/clk-bcm63xx-gate.c | 6 +- + drivers/clk/bcm/clk-raspberrypi.c | 6 +- + drivers/clk/clk-ast2600.c | 67 +- + drivers/clk/clk-axi-clkgen.c | 12 +- + drivers/clk/clk-axm5516.c | 9 +- + drivers/clk/clk-cdce706.c | 11 +- + drivers/clk/clk-conf.c | 12 +- + drivers/clk/clk-fixed-factor.c | 6 +- + drivers/clk/clk-fixed-mmio.c | 6 +- + drivers/clk/clk-fixed-rate.c | 6 +- + drivers/clk/clk-fractional-divider.c | 16 +- + drivers/clk/clk-hsdk-pll.c | 11 +- + drivers/clk/clk-lmk04832.c | 5 +- + drivers/clk/clk-loongson1.c | 303 +++++ + drivers/clk/clk-loongson2.c | 341 +++++ + drivers/clk/clk-milbeaut.c | 4 +- + drivers/clk/clk-palmas.c | 5 +- + drivers/clk/clk-pwm.c | 6 +- + drivers/clk/clk-renesas-pcie.c | 70 +- + drivers/clk/clk-s2mps11.c | 6 +- + drivers/clk/clk-scpi.c | 5 +- + drivers/clk/clk-si514.c | 10 +- + drivers/clk/clk-si521xx.c | 395 ++++++ + drivers/clk/clk-si5351.c | 10 +- + drivers/clk/clk-si570.c | 14 +- + drivers/clk/clk-sp7021.c | 713 +++++++++++ + drivers/clk/clk-stm32h7.c | 1 - + drivers/clk/clk-stm32mp1.c | 6 +- + drivers/clk/clk.c | 10 +- + drivers/clk/hisilicon/clk-hi3519.c | 5 +- + drivers/clk/hisilicon/clk-hi3559a.c | 5 +- + drivers/clk/hisilicon/crg-hi3516cv300.c | 5 +- + drivers/clk/hisilicon/crg-hi3798cv200.c | 5 +- + drivers/clk/imx/Makefile | 2 +- + drivers/clk/imx/clk-composite-7ulp.c | 4 - + drivers/clk/imx/clk-composite-8m.c | 7 + + drivers/clk/imx/clk-composite-93.c | 8 +- + drivers/clk/imx/clk-fracn-gppll.c | 91 +- + drivers/clk/imx/clk-gpr-mux.c | 3 +- + drivers/clk/imx/clk-imx8mm.c | 2 +- + drivers/clk/imx/clk-imx8mn.c | 2 +- + drivers/clk/imx/clk-imx8mp-audiomix.c | 277 ++++ + drivers/clk/imx/clk-imx8mp.c | 5 +- + drivers/clk/imx/clk-imx8ulp.c | 34 +- + drivers/clk/imx/clk-imx93.c | 19 +- + drivers/clk/imx/clk.h | 23 +- + drivers/clk/keystone/sci-clk.c | 6 +- + drivers/clk/loongson1/Makefile | 4 - + drivers/clk/loongson1/clk-loongson1b.c | 118 -- + drivers/clk/loongson1/clk-loongson1c.c | 95 -- + drivers/clk/loongson1/clk.c | 41 - + drivers/clk/loongson1/clk.h | 15 - + drivers/clk/mediatek/Kconfig | 399 +++++- + drivers/clk/mediatek/Makefile | 68 +- + drivers/clk/mediatek/clk-fhctl.c | 26 +- + drivers/clk/mediatek/clk-fhctl.h | 9 +- + drivers/clk/mediatek/clk-mt2701-aud.c | 45 +- + drivers/clk/mediatek/clk-mt2701-bdp.c | 25 +- + drivers/clk/mediatek/clk-mt2701-eth.c | 15 +- + drivers/clk/mediatek/clk-mt2701-g3d.c | 15 +- + drivers/clk/mediatek/clk-mt2701-hif.c | 15 +- + drivers/clk/mediatek/clk-mt2701-img.c | 15 +- + drivers/clk/mediatek/clk-mt2701-mm.c | 56 +- + drivers/clk/mediatek/clk-mt2701-vdec.c | 25 +- + drivers/clk/mediatek/clk-mt2701.c | 44 +- + drivers/clk/mediatek/clk-mt2712-apmixedsys.c | 168 +++ + drivers/clk/mediatek/clk-mt2712-bdp.c | 15 +- + drivers/clk/mediatek/clk-mt2712-img.c | 15 +- + drivers/clk/mediatek/clk-mt2712-jpgdec.c | 15 +- + drivers/clk/mediatek/clk-mt2712-mfg.c | 15 +- + drivers/clk/mediatek/clk-mt2712-mm.c | 66 +- + drivers/clk/mediatek/clk-mt2712-vdec.c | 25 +- + drivers/clk/mediatek/clk-mt2712-venc.c | 15 +- + drivers/clk/mediatek/clk-mt2712.c | 1010 ++++----------- + drivers/clk/mediatek/clk-mt6765-audio.c | 25 +- + drivers/clk/mediatek/clk-mt6765-cam.c | 15 +- + drivers/clk/mediatek/clk-mt6765-img.c | 15 +- + drivers/clk/mediatek/clk-mt6765-mipi0a.c | 15 +- + drivers/clk/mediatek/clk-mt6765-mm.c | 15 +- + drivers/clk/mediatek/clk-mt6765-vcodec.c | 15 +- + drivers/clk/mediatek/clk-mt6765.c | 82 +- + drivers/clk/mediatek/clk-mt6779-aud.c | 1 + + drivers/clk/mediatek/clk-mt6779-cam.c | 1 + + drivers/clk/mediatek/clk-mt6779-img.c | 1 + + drivers/clk/mediatek/clk-mt6779-ipe.c | 1 + + drivers/clk/mediatek/clk-mt6779-mfg.c | 1 + + drivers/clk/mediatek/clk-mt6779-mm.c | 25 +- + drivers/clk/mediatek/clk-mt6779-vdec.c | 1 + + drivers/clk/mediatek/clk-mt6779-venc.c | 1 + + drivers/clk/mediatek/clk-mt6779.c | 1 + + drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 64 +- + drivers/clk/mediatek/clk-mt6795-infracfg.c | 1 + + drivers/clk/mediatek/clk-mt6795-mfg.c | 1 + + drivers/clk/mediatek/clk-mt6795-mm.c | 56 +- + drivers/clk/mediatek/clk-mt6795-pericfg.c | 1 + + drivers/clk/mediatek/clk-mt6795-topckgen.c | 1 + + drivers/clk/mediatek/clk-mt6795-vdecsys.c | 1 + + drivers/clk/mediatek/clk-mt6795-vencsys.c | 1 + + drivers/clk/mediatek/clk-mt6797-img.c | 15 +- + drivers/clk/mediatek/clk-mt6797-mm.c | 56 +- + drivers/clk/mediatek/clk-mt6797-vdec.c | 25 +- + drivers/clk/mediatek/clk-mt6797-venc.c | 15 +- + drivers/clk/mediatek/clk-mt6797.c | 44 +- + drivers/clk/mediatek/clk-mt7622-apmixedsys.c | 152 +++ + drivers/clk/mediatek/clk-mt7622-aud.c | 45 +- + drivers/clk/mediatek/clk-mt7622-eth.c | 25 +- + drivers/clk/mediatek/clk-mt7622-hif.c | 25 +- + drivers/clk/mediatek/clk-mt7622-infracfg.c | 128 ++ + drivers/clk/mediatek/clk-mt7622.c | 371 +----- + drivers/clk/mediatek/clk-mt7629-eth.c | 22 +- + drivers/clk/mediatek/clk-mt7629-hif.c | 25 +- + drivers/clk/mediatek/clk-mt7629.c | 42 +- + drivers/clk/mediatek/clk-mt7981-apmixed.c | 2 + + drivers/clk/mediatek/clk-mt7981-eth.c | 3 +- + drivers/clk/mediatek/clk-mt7981-infracfg.c | 4 +- + drivers/clk/mediatek/clk-mt7981-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt7986-apmixed.c | 8 +- + drivers/clk/mediatek/clk-mt7986-eth.c | 112 +- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 90 +- + drivers/clk/mediatek/clk-mt7986-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8135-apmixedsys.c | 105 ++ + drivers/clk/mediatek/clk-mt8135.c | 268 ++-- + drivers/clk/mediatek/clk-mt8167-apmixedsys.c | 145 +++ + drivers/clk/mediatek/clk-mt8167-aud.c | 46 +- + drivers/clk/mediatek/clk-mt8167-img.c | 50 +- + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 50 +- + drivers/clk/mediatek/clk-mt8167-mm.c | 69 +- + drivers/clk/mediatek/clk-mt8167-vdec.c | 57 +- + drivers/clk/mediatek/clk-mt8167.c | 382 ++---- + drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 66 +- + drivers/clk/mediatek/clk-mt8173-img.c | 1 + + drivers/clk/mediatek/clk-mt8173-infracfg.c | 1 + + drivers/clk/mediatek/clk-mt8173-mm.c | 82 +- + drivers/clk/mediatek/clk-mt8173-pericfg.c | 1 + + drivers/clk/mediatek/clk-mt8173-topckgen.c | 1 + + drivers/clk/mediatek/clk-mt8173-vdecsys.c | 1 + + drivers/clk/mediatek/clk-mt8173-vencsys.c | 1 + + drivers/clk/mediatek/clk-mt8183-apmixedsys.c | 195 +++ + drivers/clk/mediatek/clk-mt8183-audio.c | 5 +- + drivers/clk/mediatek/clk-mt8183-cam.c | 5 +- + drivers/clk/mediatek/clk-mt8183-img.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu0.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu1.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 5 +- + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 5 +- + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 5 +- + drivers/clk/mediatek/clk-mt8183-mm.c | 29 +- + drivers/clk/mediatek/clk-mt8183-vdec.c | 5 +- + drivers/clk/mediatek/clk-mt8183-venc.c | 5 +- + drivers/clk/mediatek/clk-mt8183.c | 771 +++-------- + drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 6 +- + drivers/clk/mediatek/clk-mt8186-cam.c | 4 +- + drivers/clk/mediatek/clk-mt8186-img.c | 4 +- + drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c | 4 +- + drivers/clk/mediatek/clk-mt8186-infra_ao.c | 4 +- + drivers/clk/mediatek/clk-mt8186-ipe.c | 4 +- + drivers/clk/mediatek/clk-mt8186-mcu.c | 69 +- + drivers/clk/mediatek/clk-mt8186-mdp.c | 4 +- + drivers/clk/mediatek/clk-mt8186-mfg.c | 4 +- + drivers/clk/mediatek/clk-mt8186-mm.c | 59 +- + drivers/clk/mediatek/clk-mt8186-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8186-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt8186-venc.c | 4 +- + drivers/clk/mediatek/clk-mt8186-wpe.c | 4 +- + drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c | 50 + + drivers/clk/mediatek/clk-mt8188-apmixedsys.c | 157 +++ + drivers/clk/mediatek/clk-mt8188-cam.c | 120 ++ + drivers/clk/mediatek/clk-mt8188-ccu.c | 50 + + drivers/clk/mediatek/clk-mt8188-img.c | 112 ++ + drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c | 82 ++ + drivers/clk/mediatek/clk-mt8188-infra_ao.c | 199 +++ + drivers/clk/mediatek/clk-mt8188-ipe.c | 52 + + drivers/clk/mediatek/clk-mt8188-mfg.c | 49 + + drivers/clk/mediatek/clk-mt8188-peri_ao.c | 59 + + drivers/clk/mediatek/clk-mt8188-topckgen.c | 1350 ++++++++++++++++++++ + drivers/clk/mediatek/clk-mt8188-vdec.c | 92 ++ + drivers/clk/mediatek/clk-mt8188-vdo0.c | 107 ++ + drivers/clk/mediatek/clk-mt8188-vdo1.c | 154 +++ + drivers/clk/mediatek/clk-mt8188-venc.c | 56 + + drivers/clk/mediatek/clk-mt8188-vpp0.c | 114 ++ + drivers/clk/mediatek/clk-mt8188-vpp1.c | 109 ++ + drivers/clk/mediatek/clk-mt8188-wpe.c | 105 ++ + drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 215 ++++ + drivers/clk/mediatek/clk-mt8192-aud.c | 5 +- + drivers/clk/mediatek/clk-mt8192-cam.c | 5 +- + drivers/clk/mediatek/clk-mt8192-img.c | 5 +- + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 5 +- + drivers/clk/mediatek/clk-mt8192-ipe.c | 5 +- + drivers/clk/mediatek/clk-mt8192-mdp.c | 5 +- + drivers/clk/mediatek/clk-mt8192-mfg.c | 5 +- + drivers/clk/mediatek/clk-mt8192-mm.c | 34 +- + drivers/clk/mediatek/clk-mt8192-msdc.c | 5 +- + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 5 +- + drivers/clk/mediatek/clk-mt8192-vdec.c | 5 +- + drivers/clk/mediatek/clk-mt8192-venc.c | 5 +- + drivers/clk/mediatek/clk-mt8192.c | 160 +-- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 73 +- + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 4 +- + drivers/clk/mediatek/clk-mt8195-cam.c | 4 +- + drivers/clk/mediatek/clk-mt8195-ccu.c | 4 +- + drivers/clk/mediatek/clk-mt8195-img.c | 4 +- + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 4 +- + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 4 +- + drivers/clk/mediatek/clk-mt8195-ipe.c | 4 +- + drivers/clk/mediatek/clk-mt8195-mfg.c | 4 +- + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 4 +- + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 4 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8195-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 59 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 61 +- + drivers/clk/mediatek/clk-mt8195-venc.c | 4 +- + drivers/clk/mediatek/clk-mt8195-vpp0.c | 58 +- + drivers/clk/mediatek/clk-mt8195-vpp1.c | 58 +- + drivers/clk/mediatek/clk-mt8195-wpe.c | 4 +- + drivers/clk/mediatek/clk-mt8365-apmixedsys.c | 166 +++ + drivers/clk/mediatek/clk-mt8365-apu.c | 3 +- + drivers/clk/mediatek/clk-mt8365-cam.c | 3 +- + drivers/clk/mediatek/clk-mt8365-mfg.c | 3 +- + drivers/clk/mediatek/clk-mt8365-mm.c | 42 +- + drivers/clk/mediatek/clk-mt8365-vdec.c | 3 +- + drivers/clk/mediatek/clk-mt8365-venc.c | 3 +- + drivers/clk/mediatek/clk-mt8365.c | 606 ++------- + drivers/clk/mediatek/clk-mt8516-apmixedsys.c | 122 ++ + drivers/clk/mediatek/clk-mt8516-aud.c | 46 +- + drivers/clk/mediatek/clk-mt8516.c | 240 +--- + drivers/clk/mediatek/clk-mtk.c | 82 +- + drivers/clk/mediatek/clk-mtk.h | 7 +- + drivers/clk/mediatek/clk-pllfh.c | 37 +- + drivers/clk/mediatek/clk-pllfh.h | 1 + + drivers/clk/microchip/clk-mpfs.c | 3 +- + drivers/clk/mmp/clk-audio.c | 6 +- + drivers/clk/mvebu/armada-37xx-periph.c | 6 +- + drivers/clk/mvebu/armada-37xx-tbg.c | 6 +- + drivers/clk/mvebu/armada-37xx-xtal.c | 6 +- + drivers/clk/renesas/r8a77970-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77980-cpg-mssr.c | 18 + + drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 24 + + drivers/clk/renesas/r9a06g032-clocks.c | 736 ++++++++--- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 6 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 8 +- + drivers/clk/rockchip/clk.c | 2 - + drivers/clk/sifive/Kconfig | 6 +- + drivers/clk/socfpga/clk-gate-a10.c | 26 +- + drivers/clk/socfpga/clk-gate.c | 35 +- + drivers/clk/socfpga/clk-periph-a10.c | 22 +- + drivers/clk/socfpga/clk-periph.c | 26 +- + drivers/clk/socfpga/clk-pll-a10.c | 30 +- + drivers/clk/socfpga/clk-pll.c | 32 +- + drivers/clk/sprd/common.c | 2 +- + drivers/clk/starfive/Kconfig | 33 +- + drivers/clk/starfive/Makefile | 6 +- + drivers/clk/starfive/clk-starfive-jh7100-audio.c | 74 +- + drivers/clk/starfive/clk-starfive-jh7100.c | 716 +++-------- + drivers/clk/starfive/clk-starfive-jh7100.h | 112 -- + drivers/clk/starfive/clk-starfive-jh7110-aon.c | 156 +++ + drivers/clk/starfive/clk-starfive-jh7110-sys.c | 499 ++++++++ + drivers/clk/starfive/clk-starfive-jh7110.h | 11 + + drivers/clk/starfive/clk-starfive-jh71x0.c | 333 +++++ + drivers/clk/starfive/clk-starfive-jh71x0.h | 123 ++ + drivers/clk/stm32/clk-stm32mp13.c | 6 +- + drivers/clk/tegra/clk-dfll.c | 5 +- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 17 +- + drivers/clk/tegra/clk-tegra20.c | 28 +- + drivers/clk/ti/adpll.c | 6 +- + drivers/clk/ti/clkctrl.c | 6 +- + drivers/clk/uniphier/clk-uniphier-core.c | 12 +- + drivers/clk/visconti/pll.h | 1 - + drivers/clk/x86/clk-fch.c | 7 +- + drivers/clk/x86/clk-pmc-atom.c | 5 +- + drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 234 +++- + drivers/clk/xilinx/xlnx_vcu.c | 8 +- + drivers/clk/zynqmp/pll.c | 2 - + drivers/reset/Kconfig | 8 +- + drivers/reset/Makefile | 2 +- + drivers/reset/reset-starfive-jh7100.c | 173 --- + drivers/reset/starfive/Kconfig | 20 + + drivers/reset/starfive/Makefile | 5 + + drivers/reset/starfive/reset-starfive-jh7100.c | 74 ++ + drivers/reset/starfive/reset-starfive-jh7110.c | 73 ++ + drivers/reset/starfive/reset-starfive-jh71x0.c | 131 ++ + drivers/reset/starfive/reset-starfive-jh71x0.h | 14 + + include/dt-bindings/clock/ast2600-clock.h | 5 +- + include/dt-bindings/clock/bcm63268-clock.h | 13 + + include/dt-bindings/clock/imx8mp-clock.h | 4 +- + include/dt-bindings/clock/imx93-clock.h | 6 +- + include/dt-bindings/clock/loongson,ls1x-clk.h | 19 + + include/dt-bindings/clock/loongson,ls2k-clk.h | 3 +- + include/dt-bindings/clock/mediatek,mt8188-clk.h | 726 +++++++++++ + include/dt-bindings/clock/starfive,jh7110-crg.h | 221 ++++ + include/dt-bindings/reset/bcm63268-reset.h | 4 + + include/dt-bindings/reset/starfive,jh7110-crg.h | 154 +++ + include/linux/clk-provider.h | 21 +- + include/soc/starfive/reset-starfive-jh71x0.h | 17 + + 317 files changed, 13939 insertions(+), 6310 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm63268-timer-clocks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml + create mode 100644 Documentation/devicetree/bindings/clock/loongson,ls1x-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt8188-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt8188-sys-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/skyworks,si521xx.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-aoncrg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-syscrg.yaml + create mode 100644 drivers/clk/bcm/clk-bcm63268-timer.c + create mode 100644 drivers/clk/clk-loongson1.c + create mode 100644 drivers/clk/clk-loongson2.c + create mode 100644 drivers/clk/clk-si521xx.c + create mode 100644 drivers/clk/clk-sp7021.c + create mode 100644 drivers/clk/imx/clk-imx8mp-audiomix.c + delete mode 100644 drivers/clk/loongson1/Makefile + delete mode 100644 drivers/clk/loongson1/clk-loongson1b.c + delete mode 100644 drivers/clk/loongson1/clk-loongson1c.c + delete mode 100644 drivers/clk/loongson1/clk.c + delete mode 100644 drivers/clk/loongson1/clk.h + create mode 100644 drivers/clk/mediatek/clk-mt2712-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt7622-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt7622-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8135-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8167-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-ccu.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-infra_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-ipe.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-mfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-peri_ao.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vdo0.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vdo1.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vpp0.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-vpp1.c + create mode 100644 drivers/clk/mediatek/clk-mt8188-wpe.c + create mode 100644 drivers/clk/mediatek/clk-mt8192-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8365-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8516-apmixedsys.c + delete mode 100644 drivers/clk/starfive/clk-starfive-jh7100.h + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-aon.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-sys.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110.h + create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh71x0.h + delete mode 100644 drivers/reset/reset-starfive-jh7100.c + create mode 100644 drivers/reset/starfive/Kconfig + create mode 100644 drivers/reset/starfive/Makefile + create mode 100644 drivers/reset/starfive/reset-starfive-jh7100.c + create mode 100644 drivers/reset/starfive/reset-starfive-jh7110.c + create mode 100644 drivers/reset/starfive/reset-starfive-jh71x0.c + create mode 100644 drivers/reset/starfive/reset-starfive-jh71x0.h + create mode 100644 include/dt-bindings/clock/loongson,ls1x-clk.h + create mode 100644 include/dt-bindings/clock/mediatek,mt8188-clk.h + create mode 100644 include/dt-bindings/clock/starfive,jh7110-crg.h + create mode 100644 include/dt-bindings/reset/starfive,jh7110-crg.h + create mode 100644 include/soc/starfive/reset-starfive-jh71x0.h +Merging clk-imx/for-next (8a05f5cccdbe8 clk: imx: imx8ulp: update clk flag for system critical clock) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (5e96c2e0e88d3 clk: renesas: r8a77980: Add I2C5 clock) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (b35f27fe73d8c clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (1f62ed00a56bf csky: mmu: Prevent spurious page faults) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Auto-merging arch/csky/Kconfig +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 5 ----- + arch/csky/abiv1/cacheflush.c | 3 +++ + arch/csky/abiv2/cacheflush.c | 3 +++ + 3 files changed, 6 insertions(+), 5 deletions(-) +Merging loongarch/loongarch-next (fc89d7fb499b0 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (1ea3bb3e4b767 m68k: defconfig: Update defconfigs for v6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.debug | 5 ----- + arch/m68k/configs/amiga_defconfig | 3 ++- + arch/m68k/configs/apollo_defconfig | 3 ++- + arch/m68k/configs/atari_defconfig | 3 ++- + arch/m68k/configs/bvme6000_defconfig | 3 ++- + arch/m68k/configs/hp300_defconfig | 3 ++- + arch/m68k/configs/mac_defconfig | 3 ++- + arch/m68k/configs/multi_defconfig | 4 ++-- + arch/m68k/configs/mvme147_defconfig | 3 ++- + arch/m68k/configs/mvme16x_defconfig | 3 ++- + arch/m68k/configs/q40_defconfig | 3 ++- + arch/m68k/configs/sun3_defconfig | 3 ++- + arch/m68k/configs/sun3x_defconfig | 3 ++- + drivers/nubus/bus.c | 6 ------ + 14 files changed, 24 insertions(+), 24 deletions(-) +Merging m68knommu/for-next (31e576abf603a m68k: Kconfig.machine: remove obsolete configs ROMBASE and ROMSIZE) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 -- + arch/m68k/Kconfig.machine | 17 ----------------- + 2 files changed, 19 deletions(-) +Merging microblaze/next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (20470a68a049d Revert "MIPS: generic: Enable all CPUs supported by virt board in Kconfig") +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Removing arch/mips/mti-malta/malta-amon.c +Removing arch/mips/kernel/vpe-cmp.c +Removing arch/mips/kernel/smp-cmp.c +Removing arch/mips/kernel/rtlx-cmp.c +Removing arch/mips/include/asm/sibyte/carmel.h +Removing arch/mips/include/asm/mach-generic/ide.h +Removing arch/mips/include/asm/ide.h +Auto-merging arch/mips/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mips/loongson/devices.yaml | 12 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 77 +-------- + arch/mips/Makefile | 38 +++++ + arch/mips/ath79/Kconfig | 16 -- + arch/mips/bcm47xx/board.c | 1 + + arch/mips/bcm47xx/leds.c | 8 + + arch/mips/cavium-octeon/Kconfig | 3 +- + arch/mips/cavium-octeon/octeon-irq.c | 35 ++-- + arch/mips/configs/generic/board-virt.config | 38 +++++ + arch/mips/fw/lib/cmdline.c | 2 +- + arch/mips/include/asm/asmmacro.h | 4 +- + arch/mips/include/asm/cache.h | 2 + + arch/mips/include/asm/cacheflush.h | 1 - + arch/mips/include/asm/cpu-features.h | 21 ++- + arch/mips/include/asm/ide.h | 13 -- + arch/mips/include/asm/io.h | 2 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/include/asm/mach-generic/ide.h | 138 ---------------- + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 3 - + arch/mips/include/asm/mach-ralink/mt7620.h | 3 +- + arch/mips/include/asm/mach-ralink/rt288x.h | 3 +- + arch/mips/include/asm/mach-ralink/rt305x.h | 3 +- + arch/mips/include/asm/mach-ralink/rt3883.h | 4 +- + arch/mips/include/asm/processor.h | 7 +- + arch/mips/include/asm/rtlx.h | 1 - + arch/mips/include/asm/sibyte/board.h | 6 +- + arch/mips/include/asm/sibyte/carmel.h | 45 ------ + arch/mips/include/asm/sibyte/swarm.h | 5 - + arch/mips/include/asm/smp-ops.h | 16 -- + arch/mips/include/asm/vpe.h | 4 - + arch/mips/kernel/Makefile | 3 - + arch/mips/kernel/asm-offsets.c | 3 + + arch/mips/kernel/cps-vec.S | 5 + + arch/mips/kernel/cpu-probe.c | 2 + + arch/mips/kernel/mips-cm.c | 9 +- + arch/mips/kernel/octeon_switch.S | 6 - + arch/mips/kernel/rtlx-cmp.c | 122 -------------- + arch/mips/kernel/smp-cmp.c | 148 ----------------- + arch/mips/kernel/smp-cps.c | 5 + + arch/mips/kernel/uprobes.c | 18 --- + arch/mips/kernel/vpe-cmp.c | 180 --------------------- + arch/mips/kernel/vpe.c | 2 +- + arch/mips/loongson2ef/Kconfig | 3 + + arch/mips/loongson2ef/Platform | 35 ---- + arch/mips/loongson2ef/common/cs5536/cs5536_isa.c | 2 +- + arch/mips/loongson64/Platform | 16 -- + arch/mips/loongson64/setup.c | 15 -- + arch/mips/loongson64/smp.c | 50 +++--- + arch/mips/mm/c-octeon.c | 5 + + arch/mips/mm/c-r3k.c | 5 - + arch/mips/mm/c-r4k.c | 129 +-------------- + arch/mips/mm/cache.c | 21 ++- + arch/mips/mti-malta/Makefile | 2 - + arch/mips/mti-malta/malta-amon.c | 88 ---------- + arch/mips/mti-malta/malta-init.c | 2 - + arch/mips/mti-malta/malta-platform.c | 2 - + arch/mips/pci/pci-lantiq.c | 2 +- + arch/mips/pci/pci-rt3883.c | 2 +- + arch/mips/ralink/Kconfig | 4 + + arch/mips/ralink/mt7620.c | 145 ++++++++++++++--- + arch/mips/ralink/mt7621.c | 2 - + arch/mips/ralink/rt288x.c | 94 +++++++++-- + arch/mips/ralink/rt305x.c | 147 ++++++++++++++--- + arch/mips/ralink/rt3883.c | 94 +++++++++-- + arch/mips/sibyte/Kconfig | 33 +--- + arch/mips/sibyte/Makefile | 6 - + arch/mips/sibyte/Platform | 8 - + arch/mips/sibyte/common/bus_watcher.c | 4 +- + arch/mips/sibyte/common/cfe.c | 17 +- + arch/mips/sibyte/common/sb_tbprof.c | 10 +- + arch/mips/sibyte/swarm/setup.c | 12 +- + drivers/irqchip/irq-mips-gic.c | 26 --- + 74 files changed, 651 insertions(+), 1348 deletions(-) + create mode 100644 arch/mips/configs/generic/board-virt.config + delete mode 100644 arch/mips/include/asm/ide.h + delete mode 100644 arch/mips/include/asm/mach-generic/ide.h + delete mode 100644 arch/mips/include/asm/sibyte/carmel.h + delete mode 100644 arch/mips/kernel/rtlx-cmp.c + delete mode 100644 arch/mips/kernel/smp-cmp.c + delete mode 100644 arch/mips/kernel/vpe-cmp.c + delete mode 100644 arch/mips/mti-malta/malta-amon.c +Merging openrisc/for-next (1aff44abf68a8 openrisc: Use common of_get_cpu_node() instead of open-coding) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/kernel/setup.c | 19 ++----------------- + 1 file changed, 2 insertions(+), 17 deletions(-) +Merging parisc-hd/for-next (7833946305534 parisc: Ensure page alignment in flush functions) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Auto-merging Documentation/kbuild/kbuild.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1695 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/kbuild/kbuild.rst | 1 + + arch/parisc/include/asm/kgdb.h | 2 ++ + arch/parisc/include/asm/pdc.h | 1 + + arch/parisc/kernel/firmware.c | 27 +++++++++++++++++++++++---- + arch/parisc/kernel/pacache.S | 2 ++ + drivers/parisc/power.c | 16 ++++++++++------ + 6 files changed, 39 insertions(+), 10 deletions(-) +Merging powerpc/next (8002725b9e336 powerpc/32: Include thread_info.h in head_booke.h) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c +Auto-merging arch/powerpc/mm/numa.c +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 + + arch/powerpc/Kconfig | 8 +- + arch/powerpc/Makefile | 5 +- + arch/powerpc/boot/Makefile | 6 +- + arch/powerpc/include/asm/atomic.h | 29 --- + arch/powerpc/include/asm/iommu.h | 6 +- + arch/powerpc/include/asm/kvm_host.h | 4 +- + arch/powerpc/include/asm/kvm_ppc.h | 64 ++++-- + arch/powerpc/include/asm/machdep.h | 3 +- + arch/powerpc/include/asm/pci-bridge.h | 7 + + arch/powerpc/include/asm/ppc_asm.h | 8 + + arch/powerpc/include/asm/reg.h | 6 + + arch/powerpc/include/asm/rtas-types.h | 4 +- + arch/powerpc/include/asm/thread_info.h | 40 ++++ + arch/powerpc/include/asm/uaccess.h | 2 - + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/entry_32.S | 23 +- + arch/powerpc/kernel/head_booke.h | 1 + + arch/powerpc/kernel/idle.c | 10 +- + arch/powerpc/kernel/interrupt_64.S | 28 ++- + arch/powerpc/kernel/iommu.c | 246 ++++++++++++++++++++- + arch/powerpc/kernel/isa-bridge.c | 166 ++++---------- + arch/powerpc/kernel/legacy_serial.c | 10 +- + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/process.c | 126 ++++++----- + arch/powerpc/kernel/rtas.c | 54 ++++- + arch/powerpc/kernel/setup-common.c | 13 +- + arch/powerpc/kernel/time.c | 6 +- + arch/powerpc/kvm/book3s.c | 64 ++++-- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 26 ++- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 13 +- + arch/powerpc/kvm/book3s_hv.c | 47 ++-- + arch/powerpc/kvm/book3s_hv_nested.c | 9 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 10 +- + arch/powerpc/kvm/book3s_paired_singles.c | 4 +- + arch/powerpc/kvm/book3s_pr.c | 26 ++- + arch/powerpc/kvm/book3s_rmhandlers.S | 1 + + arch/powerpc/kvm/booke.c | 30 ++- + arch/powerpc/kvm/booke.h | 3 + + arch/powerpc/kvm/bookehv_interrupts.S | 2 +- + arch/powerpc/kvm/e500_mmu_host.c | 4 +- + arch/powerpc/kvm/e500mc.c | 2 +- + arch/powerpc/kvm/emulate.c | 8 +- + arch/powerpc/kvm/emulate_loadstore.c | 14 +- + arch/powerpc/kvm/powerpc.c | 8 +- + arch/powerpc/lib/pmem.c | 7 - + arch/powerpc/mm/numa.c | 21 +- + arch/powerpc/perf/mpc7450-pmu.c | 6 +- + arch/powerpc/platforms/40x/ppc40x_simple.c | 1 - + arch/powerpc/platforms/44x/canyonlands.c | 10 +- + arch/powerpc/platforms/44x/ebony.c | 5 +- + arch/powerpc/platforms/44x/fsp2.c | 1 - + arch/powerpc/platforms/44x/iss4xx.c | 16 +- + arch/powerpc/platforms/44x/ppc44x_simple.c | 1 - + arch/powerpc/platforms/44x/ppc476.c | 39 ++-- + arch/powerpc/platforms/44x/sam440ep.c | 5 +- + arch/powerpc/platforms/44x/warp.c | 11 +- + arch/powerpc/platforms/4xx/pci.c | 18 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 2 +- + arch/powerpc/platforms/512x/mpc5121_ads.c | 5 +- + arch/powerpc/platforms/512x/mpc512x_generic.c | 1 - + arch/powerpc/platforms/512x/pdm360ng.c | 5 +- + arch/powerpc/platforms/52xx/efika.c | 1 - + arch/powerpc/platforms/52xx/lite5200.c | 1 - + arch/powerpc/platforms/52xx/lite5200_pm.c | 9 +- + arch/powerpc/platforms/52xx/media5200.c | 17 +- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 - + arch/powerpc/platforms/52xx/mpc52xx_common.c | 4 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 4 +- + arch/powerpc/platforms/82xx/ep8248e.c | 11 +- + arch/powerpc/platforms/82xx/km82xx.c | 11 +- + arch/powerpc/platforms/82xx/mpc8272_ads.c | 11 +- + arch/powerpc/platforms/82xx/pq2fads.c | 11 +- + arch/powerpc/platforms/83xx/asp834x.c | 11 +- + arch/powerpc/platforms/83xx/km83xx.c | 1 - + arch/powerpc/platforms/83xx/mpc830x_rdb.c | 1 - + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 - + arch/powerpc/platforms/83xx/mpc832x_mds.c | 11 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 11 +- + arch/powerpc/platforms/83xx/mpc834x_itx.c | 11 +- + arch/powerpc/platforms/83xx/mpc834x_mds.c | 11 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 11 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 11 +- + arch/powerpc/platforms/83xx/mpc837x_mds.c | 11 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 - + arch/powerpc/platforms/85xx/bsc913x_qds.c | 12 +- + arch/powerpc/platforms/85xx/bsc913x_rdb.c | 12 +- + arch/powerpc/platforms/85xx/c293pcie.c | 13 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 1 - + arch/powerpc/platforms/85xx/ge_imp3a.c | 11 +- + arch/powerpc/platforms/85xx/ksi8560.c | 11 +- + arch/powerpc/platforms/85xx/mpc8536_ds.c | 11 +- + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 11 +- + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 12 +- + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 33 +-- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 25 +-- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 91 +------- + arch/powerpc/platforms/85xx/mvme2500.c | 11 +- + arch/powerpc/platforms/85xx/p1010rdb.c | 1 - + arch/powerpc/platforms/85xx/p1022_ds.c | 11 +- + arch/powerpc/platforms/85xx/p1022_rdk.c | 11 +- + arch/powerpc/platforms/85xx/p1023_rdb.c | 17 +- + arch/powerpc/platforms/85xx/ppa8548.c | 11 +- + arch/powerpc/platforms/85xx/qemu_e500.c | 11 +- + arch/powerpc/platforms/85xx/socrates.c | 14 +- + arch/powerpc/platforms/85xx/stx_gp3.c | 11 +- + arch/powerpc/platforms/85xx/tqm85xx.c | 1 - + arch/powerpc/platforms/85xx/twr_p102x.c | 8 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 27 +-- + arch/powerpc/platforms/86xx/gef_ppc9a.c | 19 +- + arch/powerpc/platforms/86xx/gef_sbc310.c | 19 +- + arch/powerpc/platforms/86xx/gef_sbc610.c | 19 +- + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 14 +- + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 15 +- + arch/powerpc/platforms/86xx/mvme7100.c | 1 - + arch/powerpc/platforms/8xx/adder875.c | 8 +- + arch/powerpc/platforms/8xx/ep88xc.c | 7 +- + arch/powerpc/platforms/8xx/mpc86xads_setup.c | 7 +- + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 7 +- + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 7 +- + arch/powerpc/platforms/amigaone/setup.c | 22 +- + arch/powerpc/platforms/cell/axon_msi.c | 9 +- + arch/powerpc/platforms/cell/setup.c | 1 - + arch/powerpc/platforms/cell/spu_manage.c | 2 +- + arch/powerpc/platforms/chrp/setup.c | 1 - + arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- + arch/powerpc/platforms/embedded6xx/gamecube.c | 10 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- + arch/powerpc/platforms/embedded6xx/holly.c | 20 +- + arch/powerpc/platforms/embedded6xx/linkstation.c | 5 +- + arch/powerpc/platforms/embedded6xx/ls_uart.c | 17 +- + arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 13 +- + arch/powerpc/platforms/embedded6xx/mvme5100.c | 11 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 8 +- + arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 20 +- + arch/powerpc/platforms/embedded6xx/wii.c | 14 +- + arch/powerpc/platforms/maple/setup.c | 3 +- + arch/powerpc/platforms/microwatt/setup.c | 8 +- + arch/powerpc/platforms/pasemi/iommu.c | 2 +- + arch/powerpc/platforms/pasemi/setup.c | 1 - + arch/powerpc/platforms/powermac/feature.c | 18 +- + arch/powerpc/platforms/powermac/pic.c | 7 +- + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/powernv/opal-lpc.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 42 +++- + arch/powerpc/platforms/powernv/setup.c | 5 +- + arch/powerpc/platforms/ps3/setup.c | 4 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 45 +--- + arch/powerpc/platforms/pseries/iommu.c | 51 +++-- + arch/powerpc/platforms/pseries/mobility.c | 10 +- + arch/powerpc/platforms/pseries/pseries.h | 4 + + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/platforms/pseries/vio.c | 4 +- + arch/powerpc/sysdev/dcr.c | 2 +- + arch/powerpc/sysdev/ehv_pic.c | 6 +- + arch/powerpc/sysdev/fsl_rio.c | 23 +- + arch/powerpc/sysdev/fsl_soc.c | 2 +- + arch/powerpc/sysdev/mpic.c | 6 +- + arch/powerpc/sysdev/mpic_msgr.c | 2 +- + arch/powerpc/sysdev/tsi108_dev.c | 8 +- + arch/powerpc/sysdev/tsi108_pci.c | 5 +- + arch/powerpc/sysdev/xics/icp-native.c | 17 +- + arch/powerpc/sysdev/xive/native.c | 6 +- + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/macintosh/Kconfig | 1 + + drivers/macintosh/rack-meter.c | 2 +- + drivers/macintosh/therm_adt746x.c | 2 +- + drivers/macintosh/windfarm_smu_sat.c | 1 + + drivers/vfio/vfio_iommu_spapr_tce.c | 96 ++------ + tools/testing/selftests/powerpc/Makefile | 8 +- + tools/testing/selftests/powerpc/math/vmx_signal.c | 1 + + tools/testing/selftests/powerpc/mm/Makefile | 2 +- + tools/testing/selftests/powerpc/pmu/Makefile | 31 +-- + .../mmcra_thresh_marked_sample_test.c | 4 +- + 176 files changed, 1095 insertions(+), 1487 deletions(-) +Merging soc-fsl/next (4b0986a3613c9 Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (9c2598d43510e riscv: entry: Save a0 prior syscall_enter_from_user_mode()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/mm/fault.c +Removing arch/riscv/kernel/trace_irq.h +Removing arch/riscv/kernel/trace_irq.c +Auto-merging arch/riscv/kernel/signal.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/errata/sifive/errata.c +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/riscv/cpus.yaml | 5 + + arch/riscv/Kconfig | 48 +++- + arch/riscv/{Kconfig.erratas => Kconfig.errata} | 0 + arch/riscv/Makefile | 4 + + arch/riscv/errata/sifive/errata.c | 8 +- + arch/riscv/errata/thead/errata.c | 4 +- + arch/riscv/include/asm/alternative-macros.h | 72 ++--- + arch/riscv/include/asm/alternative.h | 15 +- + arch/riscv/include/asm/asm-prototypes.h | 2 + + arch/riscv/include/asm/asm.h | 61 ++++ + arch/riscv/include/asm/cacheflush.h | 3 +- + arch/riscv/include/asm/csr.h | 1 - + arch/riscv/include/asm/entry-common.h | 11 + + arch/riscv/include/asm/hugetlb.h | 34 ++- + arch/riscv/include/asm/hwcap.h | 2 + + arch/riscv/include/asm/insn-def.h | 4 + + arch/riscv/include/asm/page.h | 11 +- + arch/riscv/include/asm/pgtable-64.h | 34 +++ + arch/riscv/include/asm/pgtable.h | 39 ++- + arch/riscv/include/asm/ptrace.h | 10 +- + arch/riscv/include/asm/stacktrace.h | 5 + + arch/riscv/include/asm/syscall.h | 21 ++ + arch/riscv/include/asm/thread_info.h | 13 +- + arch/riscv/include/asm/vmalloc.h | 61 +++- + arch/riscv/include/uapi/asm/kvm.h | 2 + + arch/riscv/kernel/Makefile | 2 - + arch/riscv/kernel/cpu.c | 2 + + arch/riscv/kernel/cpufeature.c | 64 ++++- + arch/riscv/kernel/entry.S | 321 +++------------------- + arch/riscv/kernel/head.h | 1 - + arch/riscv/kernel/mcount-dyn.S | 57 +--- + arch/riscv/kernel/process.c | 5 +- + arch/riscv/kernel/ptrace.c | 44 --- + arch/riscv/kernel/setup.c | 2 +- + arch/riscv/kernel/signal.c | 29 +- + arch/riscv/kernel/trace_irq.c | 27 -- + arch/riscv/kernel/trace_irq.h | 11 - + arch/riscv/kernel/traps.c | 144 ++++++++-- + arch/riscv/kvm/vcpu.c | 11 + + arch/riscv/lib/Makefile | 1 + + arch/riscv/lib/clear_page.S | 74 +++++ + arch/riscv/lib/strcmp.S | 3 +- + arch/riscv/lib/strlen.S | 3 +- + arch/riscv/lib/strncmp.S | 3 +- + arch/riscv/mm/cacheflush.c | 64 +++-- + arch/riscv/mm/fault.c | 6 +- + arch/riscv/mm/hugetlbpage.c | 301 ++++++++++++++++++++ + 47 files changed, 1040 insertions(+), 605 deletions(-) + rename arch/riscv/{Kconfig.erratas => Kconfig.errata} (100%) + create mode 100644 arch/riscv/include/asm/entry-common.h + delete mode 100644 arch/riscv/kernel/trace_irq.c + delete mode 100644 arch/riscv/kernel/trace_irq.h + create mode 100644 arch/riscv/lib/clear_page.S +Merging riscv-dt/riscv-dt-for-next (4cd4beb98fe5a Merge branch 'riscv-jh7110_initial_dts' into riscv-dt-for-next) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Auto-merging Documentation/devicetree/bindings/riscv/cpus.yaml +Merge made by the 'recursive' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 1 + + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/boot/dts/microchip/mpfs.dtsi | 10 +- + arch/riscv/boot/dts/starfive/Makefile | 6 +- + arch/riscv/boot/dts/starfive/jh7110-pinfunc.h | 308 +++++++++++++ + .../jh7110-starfive-visionfive-2-v1.2a.dts | 13 + + .../jh7110-starfive-visionfive-2-v1.3b.dts | 13 + + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 215 +++++++++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 500 +++++++++++++++++++++ + 10 files changed, 1064 insertions(+), 4 deletions(-) + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-pinfunc.h + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.2a.dts + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi + create mode 100644 arch/riscv/boot/dts/starfive/jh7110.dtsi +Merging riscv-soc/riscv-soc-for-next (4dd472bdafcb6 soc: microchip: mpfs: add a prefix to rx_callback()) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/mailbox-mpfs.c | 55 +++++++++++++++------------- + drivers/soc/canaan/Kconfig | 5 +-- + drivers/soc/microchip/mpfs-sys-controller.c | 56 +++++++++++++++++++---------- + 3 files changed, 72 insertions(+), 44 deletions(-) +Merging s390/for-next (ac1cd6ce1faae Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging lib/Kconfig.debug +Removing arch/s390/mm/kasan_init.c +Auto-merging arch/s390/kernel/mcount.S +Auto-merging arch/s390/include/asm/pgtable.h +Removing arch/s390/include/asm/mem_detect.h +Removing arch/s390/boot/mem_detect.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + .../sched/membarrier-sync-core/arch-support.txt | 4 +- + arch/s390/Kconfig | 8 +- + arch/s390/appldata/appldata_base.c | 32 +- + arch/s390/boot/Makefile | 2 +- + arch/s390/boot/boot.h | 42 ++- + arch/s390/boot/install.sh | 8 +- + arch/s390/boot/ipl_parm.c | 6 +- + arch/s390/boot/ipl_report.c | 106 +++--- + arch/s390/boot/kaslr.c | 171 +++++---- + arch/s390/boot/mem_detect.c | 191 ---------- + arch/s390/boot/pgm_check_info.c | 7 +- + arch/s390/boot/physmem_info.c | 328 +++++++++++++++++ + arch/s390/boot/startup.c | 129 ++++--- + arch/s390/boot/vmem.c | 284 +++++++++++--- + arch/s390/boot/vmlinux.lds.S | 2 + + arch/s390/include/asm/ap.h | 152 ++++++-- + arch/s390/include/asm/checksum.h | 10 +- + arch/s390/include/asm/diag.h | 2 +- + arch/s390/include/asm/entry-common.h | 5 - + arch/s390/include/asm/fcx.h | 2 +- + arch/s390/include/asm/kasan.h | 31 +- + arch/s390/include/asm/linkage.h | 2 +- + arch/s390/include/asm/mem_detect.h | 117 ------ + arch/s390/include/asm/nospec-insn.h | 3 +- + arch/s390/include/asm/perf_event.h | 2 - + arch/s390/include/asm/pgtable.h | 2 +- + arch/s390/include/asm/physmem_info.h | 171 +++++++++ + arch/s390/include/asm/processor.h | 11 +- + arch/s390/include/asm/set_memory.h | 11 + + arch/s390/include/asm/setup.h | 20 +- + arch/s390/include/asm/stacktrace.h | 13 - + arch/s390/include/asm/thread_info.h | 10 +- + arch/s390/kernel/debug.c | 14 +- + arch/s390/kernel/dumpstack.c | 46 ++- + arch/s390/kernel/early.c | 23 +- + arch/s390/kernel/entry.S | 83 ++--- + arch/s390/kernel/ftrace.c | 22 +- + arch/s390/kernel/head64.S | 6 +- + arch/s390/kernel/ipl.c | 7 +- + arch/s390/kernel/kprobes.c | 2 +- + arch/s390/kernel/mcount.S | 16 + + arch/s390/kernel/module.c | 26 +- + arch/s390/kernel/perf_cpum_cf.c | 43 +-- + arch/s390/kernel/perf_cpum_sf.c | 14 +- + arch/s390/kernel/process.c | 10 +- + arch/s390/kernel/processor.c | 18 - + arch/s390/kernel/setup.c | 152 +++----- + arch/s390/kernel/smp.c | 11 +- + arch/s390/kernel/topology.c | 12 +- + arch/s390/kernel/vdso32/vdso_user_wrapper.S | 3 +- + arch/s390/kernel/vdso64/vdso_user_wrapper.S | 5 +- + arch/s390/kernel/vmlinux.lds.S | 10 +- + arch/s390/lib/uaccess.c | 137 +++---- + arch/s390/mm/Makefile | 3 - + arch/s390/mm/cmm.c | 12 +- + arch/s390/mm/init.c | 5 +- + arch/s390/mm/kasan_init.c | 301 --------------- + arch/s390/mm/pageattr.c | 4 +- + arch/s390/mm/pgalloc.c | 20 +- + arch/s390/mm/vmem.c | 35 +- + arch/s390/pci/pci.c | 23 +- + arch/s390/pci/pci_bus.c | 11 +- + drivers/s390/char/sclp.h | 2 +- + drivers/s390/char/sclp_cmd.c | 2 +- + drivers/s390/char/sclp_early_core.c | 8 +- + drivers/s390/cio/chsc.c | 2 +- + drivers/s390/cio/chsc.h | 2 +- + drivers/s390/crypto/ap_bus.c | 254 +++++++------ + drivers/s390/crypto/ap_bus.h | 70 ++-- + drivers/s390/crypto/ap_card.c | 23 +- + drivers/s390/crypto/ap_queue.c | 410 +++++++++++++++++---- + drivers/s390/crypto/vfio_ap_drv.c | 6 - + drivers/s390/crypto/vfio_ap_ops.c | 16 +- + drivers/s390/crypto/zcrypt_api.c | 60 +-- + drivers/s390/crypto/zcrypt_card.c | 6 +- + drivers/s390/crypto/zcrypt_cca_key.h | 35 +- + drivers/s390/crypto/zcrypt_cex2c.c | 66 ++-- + drivers/s390/crypto/zcrypt_cex4.c | 141 ++++--- + drivers/s390/crypto/zcrypt_msgtype50.c | 15 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 135 +++---- + drivers/s390/crypto/zcrypt_queue.c | 4 +- + lib/Kconfig.debug | 2 +- + 82 files changed, 2224 insertions(+), 1993 deletions(-) + delete mode 100644 arch/s390/boot/mem_detect.c + create mode 100644 arch/s390/boot/physmem_info.c + delete mode 100644 arch/s390/include/asm/mem_detect.h + create mode 100644 arch/s390/include/asm/physmem_info.h + delete mode 100644 arch/s390/mm/kasan_init.c +Merging sh/for-next (c2bd1e18c6f85 sh: mcount.S: fix build error when PRINTK is not enabled) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Auto-merging tools/testing/selftests/mm/run_vmtests.sh +Auto-merging tools/testing/selftests/mm/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/mm/Makefile +Auto-merging tools/perf/arch/common.c +Auto-merging Documentation/kbuild/kbuild.rst +CONFLICT (content): Merge conflict in Documentation/kbuild/kbuild.rst +Resolved 'Documentation/kbuild/kbuild.rst' using previous resolution. +Resolved 'tools/testing/selftests/mm/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 69caeab7055a4] Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/kbuild/kbuild.rst | 1 - + Documentation/scheduler/sched-arch.rst | 2 -- + Documentation/translations/zh_CN/scheduler/sched-arch.rst | 2 -- + arch/sh/Kconfig.debug | 2 +- + arch/sh/boards/Kconfig | 1 - + arch/sh/kernel/head_32.S | 6 +++--- + arch/sh/kernel/nmi_debug.c | 4 ++-- + arch/sh/kernel/setup.c | 4 ++-- + arch/sh/math-emu/sfp-util.h | 4 ---- + scripts/checkstack.pl | 7 ------- + tools/perf/arch/common.c | 2 -- + tools/scripts/Makefile.arch | 5 ----- + tools/testing/selftests/mm/Makefile | 2 +- + tools/testing/selftests/mm/run_vmtests.sh | 2 +- + 14 files changed, 10 insertions(+), 34 deletions(-) +Merging uml/next (7e364e56293bb Linux 6.3-rc5) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (e313de5b5b041 MAINTAINERS: xtensa: drop linux-xtensa@linux-xtensa.org mailing list) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (7bcf0b65b84af Merge branch 'kernel.fork' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging mm/vmscan.c +Auto-merging kernel/kthread.c +Auto-merging kernel/fork.c +Auto-merging init/main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + arch/csky/include/asm/processor.h | 2 - + drivers/vhost/Kconfig | 5 ++ + drivers/vhost/vhost.c | 124 ++++++++++++++++---------------- + drivers/vhost/vhost.h | 11 ++- + fs/notify/fanotify/fanotify_user.c | 13 ++-- + include/linux/pid.h | 1 + + include/linux/sched.h | 2 +- + include/linux/sched/task.h | 13 +++- + include/linux/sched/vhost_task.h | 23 ++++++ + init/main.c | 2 +- + kernel/Makefile | 1 + + kernel/fork.c | 123 +++++++++++++++++++++++++++---- + kernel/kthread.c | 33 ++++----- + kernel/pid.c | 19 ++--- + kernel/vhost_task.c | 117 ++++++++++++++++++++++++++++++ + mm/vmscan.c | 4 +- + tools/testing/selftests/clone3/clone3.c | 4 +- + 18 files changed, 369 insertions(+), 130 deletions(-) + create mode 100644 include/linux/sched/vhost_task.h + create mode 100644 kernel/vhost_task.c +Merging vfs-idmapping/for-next (d4425d31a5af8 Merge branch 'fs.misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Auto-merging mm/shmem.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfs/nfs3acl.c +Auto-merging fs/inode.c +Auto-merging fs/eventpoll.c +Auto-merging fs/9p/xattr.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/idmappings.rst | 178 ++++++++++++++++++++++--------- + Documentation/filesystems/mount_api.rst | 1 - + fs/9p/xattr.c | 4 - + fs/attr.c | 1 + + fs/btrfs/xattr.c | 4 - + fs/buffer.c | 9 +- + fs/ceph/xattr.c | 4 - + fs/cifs/xattr.c | 4 - + fs/configfs/dir.c | 9 +- + fs/devpts/inode.c | 20 +--- + fs/ecryptfs/inode.c | 4 - + fs/erofs/xattr.c | 12 +-- + fs/erofs/xattr.h | 20 ++-- + fs/eventfd.c | 41 ++----- + fs/eventpoll.c | 4 +- + fs/ext2/xattr.c | 25 +++-- + fs/ext4/xattr.c | 25 +++-- + fs/f2fs/xattr.c | 24 ++--- + fs/fuse/dev.c | 4 +- + fs/gfs2/xattr.c | 2 - + fs/hfsplus/inode.c | 28 ++++- + fs/inode.c | 8 +- + fs/internal.h | 2 - + fs/jffs2/xattr.c | 29 +++-- + fs/jfs/xattr.c | 4 - + fs/kernfs/dir.c | 8 +- + fs/libfs.c | 9 +- + fs/namespace.c | 9 +- + fs/nfs/inode.c | 4 +- + fs/nfs/nfs3_fs.h | 1 - + fs/nfs/nfs3acl.c | 6 -- + fs/nfs/nfs3super.c | 3 - + fs/nfs/super.c | 3 - + fs/nfsd/nfs4xdr.c | 3 +- + fs/ntfs3/xattr.c | 4 - + fs/ocfs2/xattr.c | 14 +-- + fs/open.c | 18 +++- + fs/orangefs/xattr.c | 2 - + fs/overlayfs/copy_up.c | 3 +- + fs/overlayfs/super.c | 8 -- + fs/pipe.c | 42 ++++++-- + fs/pnode.c | 12 +-- + fs/posix_acl.c | 61 ++++++++--- + fs/reiserfs/file.c | 7 ++ + fs/reiserfs/inode.c | 6 +- + fs/reiserfs/namei.c | 50 ++++++++- + fs/reiserfs/reiserfs.h | 2 + + fs/reiserfs/xattr.c | 55 +++++----- + fs/splice.c | 19 +++- + fs/xattr.c | 124 +++++++++++---------- + fs/xfs/xfs_xattr.c | 4 - + include/linux/fs.h | 2 + + include/linux/fs_context.h | 1 - + include/linux/pipe_fs_i.h | 8 +- + include/linux/posix_acl.h | 7 ++ + include/linux/posix_acl_xattr.h | 5 +- + include/linux/security.h | 2 +- + include/linux/xattr.h | 19 +++- + include/uapi/asm-generic/fcntl.h | 1 - + mm/shmem.c | 4 - + tools/include/uapi/asm-generic/fcntl.h | 1 - + 61 files changed, 544 insertions(+), 449 deletions(-) +Merging fscrypt/for-next (83e57e47906ce fscrypt: optimize fscrypt_initialize()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Auto-merging fs/buffer.c +Merge made by the 'recursive' strategy. + fs/buffer.c | 4 ++-- + fs/crypto/bio.c | 6 +++--- + fs/crypto/crypto.c | 19 ++++++++++++------- + fs/crypto/fname.c | 4 ++-- + fs/crypto/fscrypt_private.h | 6 +++--- + fs/crypto/hkdf.c | 4 ++-- + fs/crypto/hooks.c | 32 +++++++++++++++++++++++++++++++- + fs/crypto/keyring.c | 14 +++++++------- + fs/crypto/keysetup.c | 14 +++++++------- + fs/crypto/policy.c | 4 ++-- + include/linux/fscrypt.h | 7 +++++++ + 11 files changed, 78 insertions(+), 36 deletions(-) +Merging fscache/fscache-next (0885eacdc81f9 Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-fs-add-is_idmapped_mnt-helper.patch +Applying: fix up for "fs: add is_idmapped_mnt() helper" +Using index info to reconstruct a base tree... +M fs/cachefiles/cache.c +Falling back to patching base and 3-way merge... +Auto-merging fs/cachefiles/cache.c +No changes -- Patch already applied. +Merging afs/afs-next (0a278bc196e78 afs: Automatically generate trace tag enums) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Merge made by the 'recursive' strategy. + include/trace/events/afs.h | 475 ++++++++++++++------------------------------- + 1 file changed, 148 insertions(+), 327 deletions(-) +Merging btrfs/for-next (2e2dead21a51b Merge branch 'for-next-next-v6.3-20230411' into for-next-20230411) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'recursive' strategy. + block/Kconfig | 3 + + block/blk-cgroup.c | 78 +- + block/blk-cgroup.h | 15 +- + block/blk-core.c | 3 - + fs/btrfs/Kconfig | 1 + + fs/btrfs/bio.c | 241 ++- + fs/btrfs/bio.h | 22 +- + fs/btrfs/block-group.c | 40 +- + fs/btrfs/block-group.h | 13 +- + fs/btrfs/block-rsv.c | 21 +- + fs/btrfs/block-rsv.h | 2 +- + fs/btrfs/btrfs_inode.h | 38 +- + fs/btrfs/compression.c | 299 +-- + fs/btrfs/compression.h | 20 +- + fs/btrfs/ctree.c | 91 +- + fs/btrfs/ctree.h | 17 +- + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delayed-ref.c | 49 +- + fs/btrfs/delayed-ref.h | 22 +- + fs/btrfs/discard.c | 21 +- + fs/btrfs/disk-io.c | 153 +- + fs/btrfs/extent-tree.c | 37 +- + fs/btrfs/extent_io.c | 550 ++--- + fs/btrfs/file-item.c | 93 +- + fs/btrfs/file-item.h | 3 +- + fs/btrfs/file.c | 9 - + fs/btrfs/fs.h | 54 +- + fs/btrfs/inode-item.c | 15 +- + fs/btrfs/inode.c | 376 ++-- + fs/btrfs/ioctl.c | 5 + + fs/btrfs/locking.c | 25 +- + fs/btrfs/locking.h | 5 +- + fs/btrfs/lru_cache.h | 5 - + fs/btrfs/lzo.c | 17 +- + fs/btrfs/ordered-data.c | 120 +- + fs/btrfs/ordered-data.h | 10 +- + fs/btrfs/raid56.c | 121 +- + fs/btrfs/raid56.h | 5 + + fs/btrfs/relocation.c | 6 +- + fs/btrfs/scrub.c | 4142 ++++++++++++------------------------- + fs/btrfs/send.c | 2 +- + fs/btrfs/space-info.c | 32 +- + fs/btrfs/space-info.h | 1 + + fs/btrfs/super.c | 4 +- + fs/btrfs/sysfs.c | 5 + + fs/btrfs/tests/extent-map-tests.c | 1 - + fs/btrfs/transaction.c | 30 +- + fs/btrfs/tree-checker.c | 14 + + fs/btrfs/tree-log.c | 171 +- + fs/btrfs/volumes.c | 593 +++--- + fs/btrfs/volumes.h | 85 +- + fs/btrfs/zlib.c | 2 - + fs/btrfs/zoned.c | 4 +- + fs/btrfs/zstd.c | 1 - + include/linux/bio.h | 5 + + include/linux/blk_types.h | 18 +- + include/linux/crc32c.h | 1 - + include/linux/writeback.h | 5 - + include/trace/events/btrfs.h | 2 +- + include/uapi/linux/btrfs.h | 1 + + lib/libcrc32c.c | 6 - + 61 files changed, 2894 insertions(+), 4838 deletions(-) +Merging ceph/master (f7c4d9b133c7a rbd: avoid use-after-free in do_rbd_add() when rbd_dev_create() fails) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (9b0df27420312 cifs: reinstate original behavior again for forceuid/forcegid) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/fs_context.c | 2 ++ + fs/cifs/smb2pdu.c | 41 +++++++++++++++++++++++++++++++---------- + 2 files changed, 33 insertions(+), 10 deletions(-) +Merging configfs/for-next (77992f896745c configfs: remove mentions of committable items) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (a3d78fe3e1ae8 fs: ecryptfs: comment typo fix) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3630 and retry the command. +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 10 +++++----- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging erofs/dev (31efe13d6e20f erofs: get rid of z_erofs_fill_inode()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Auto-merging fs/erofs/xattr.h +Auto-merging fs/erofs/xattr.c +CONFLICT (content): Merge conflict in fs/erofs/xattr.c +Resolved 'fs/erofs/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d7284e5e52d3d] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/erofs.rst | 4 +- + fs/erofs/data.c | 81 +++++++------ + fs/erofs/decompressor.c | 6 +- + fs/erofs/decompressor_lzma.c | 4 +- + fs/erofs/dir.c | 25 ++-- + fs/erofs/erofs_fs.h | 168 +++++++++++++-------------- + fs/erofs/fscache.c | 5 +- + fs/erofs/inode.c | 33 +++--- + fs/erofs/internal.h | 51 ++++---- + fs/erofs/namei.c | 18 +-- + fs/erofs/super.c | 116 +++++++++++-------- + fs/erofs/xattr.c | 224 ++++++++++++++++++++++++++---------- + fs/erofs/xattr.h | 27 +---- + fs/erofs/zdata.c | 20 ++-- + fs/erofs/zmap.c | 163 ++++++++++++-------------- + include/trace/events/erofs.h | 4 +- + 16 files changed, 528 insertions(+), 421 deletions(-) +Merging exfat/dev (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (36d532d713db5 quota: mark PRINT_QUOTA_WARNING as BROKEN) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging fs/ext2/xattr.c +Merge made by the 'recursive' strategy. + fs/ext2/ext2.h | 3 ++- + fs/ext2/super.c | 7 +++++++ + fs/ext2/xattr.c | 1 - + fs/quota/Kconfig | 4 ++-- + fs/quota/dquot.c | 24 ++---------------------- + fs/quota/quota_v1.c | 2 +- + fs/quota/quota_v2.c | 2 +- + fs/reiserfs/journal.c | 2 -- + fs/reiserfs/stree.c | 2 -- + fs/udf/inode.c | 10 +++++----- + fs/udf/truncate.c | 4 ++-- + 11 files changed, 22 insertions(+), 39 deletions(-) +Merging ext4/dev (e9ebecf266c66 ext4: Use a folio in ext4_read_merkle_tree_page) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging mm/folio-compat.c +Auto-merging include/linux/pagemap.h +CONFLICT (content): Merge conflict in include/linux/pagemap.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/fscrypt.h +Auto-merging fs/nfs/file.c +CONFLICT (content): Merge conflict in fs/nfs/file.c +Auto-merging fs/netfs/buffered_read.c +Auto-merging fs/iomap/buffered-io.c +CONFLICT (content): Merge conflict in fs/iomap/buffered-io.c +Auto-merging fs/ext4/move_extent.c +Auto-merging fs/ext4/inode.c +Resolved 'fs/iomap/buffered-io.c' using previous resolution. +Resolved 'fs/nfs/file.c' using previous resolution. +Resolved 'include/linux/pagemap.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5401b26d4c7e5] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/ext4.rst | 3 - + block/bio.c | 1 + + fs/ext4/balloc.c | 124 +++---- + fs/ext4/bitmap.c | 8 +- + fs/ext4/ext4.h | 22 +- + fs/ext4/ialloc.c | 14 +- + fs/ext4/inline.c | 171 +++++---- + fs/ext4/inode.c | 723 +++++++++++++++---------------------- + fs/ext4/mballoc.c | 691 ++++++++++++++++++++++------------- + fs/ext4/mballoc.h | 17 +- + fs/ext4/move_extent.c | 33 +- + fs/ext4/page-io.c | 108 +++--- + fs/ext4/readpage.c | 72 ++-- + fs/ext4/resize.c | 7 +- + fs/ext4/super.c | 15 +- + fs/ext4/sysfs.c | 2 - + fs/ext4/verity.c | 30 +- + fs/iomap/buffered-io.c | 2 +- + fs/netfs/buffered_read.c | 3 +- + fs/nfs/file.c | 12 +- + include/linux/fscrypt.h | 21 ++ + include/linux/page-flags.h | 5 - + include/linux/pagemap.h | 2 + + include/trace/events/ext4.h | 7 - + mm/folio-compat.c | 4 +- + 25 files changed, 1058 insertions(+), 1039 deletions(-) +Merging f2fs/dev (50aa6f44e1daa f2fs: support iopoll method) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 23 ++- + Documentation/filesystems/f2fs.rst | 2 +- + fs/f2fs/checkpoint.c | 42 ++-- + fs/f2fs/compress.c | 47 ++--- + fs/f2fs/data.c | 27 +-- + fs/f2fs/debug.c | 37 ++-- + fs/f2fs/dir.c | 41 +--- + fs/f2fs/extent_cache.c | 241 +++++++--------------- + fs/f2fs/f2fs.h | 88 +++----- + fs/f2fs/file.c | 72 +++++-- + fs/f2fs/gc.c | 174 +++++++++------- + fs/f2fs/gc.h | 16 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 5 +- + fs/f2fs/namei.c | 28 ++- + fs/f2fs/node.h | 20 +- + fs/f2fs/recovery.c | 17 +- + fs/f2fs/segment.c | 343 +++++++++++++++++--------------- + fs/f2fs/segment.h | 49 +++-- + fs/f2fs/super.c | 103 ++++++++-- + fs/f2fs/sysfs.c | 35 +++- + include/linux/f2fs_fs.h | 24 +-- + 22 files changed, 720 insertions(+), 716 deletions(-) +Merging fsverity/for-next (04839139213cf fsverity: reject FS_IOC_ENABLE_VERITY on mode 3 fds) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Auto-merging fs/buffer.c +Merge made by the 'recursive' strategy. + fs/buffer.c | 9 ++++----- + fs/verity/enable.c | 21 +++++++++++++++++++-- + fs/verity/hash_algs.c | 4 ++-- + fs/verity/open.c | 2 +- + fs/verity/signature.c | 9 +-------- + include/linux/fsverity.h | 6 +++--- + 6 files changed, 30 insertions(+), 21 deletions(-) +Merging fuse/for-next (c68ea140050e6 fuse: remove duplicate check for nodeid) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 2 -- + fs/fuse/inode.c | 3 ++- + include/uapi/linux/fuse.h | 3 +++ + 3 files changed, 5 insertions(+), 3 deletions(-) +Merging gfs2/for-next (cfcdb5bad34f6 gfs2: Fix inode height consistency check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glops.c | 3 ++- + fs/gfs2/inode.c | 47 ++++++++++++++++++++++------------------------- + 2 files changed, 24 insertions(+), 26 deletions(-) +Merging jfs/jfs-next (fad376fce0af5 fs/jfs: fix shift exponent db_agl2size negative) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (20a29b94ee790 ksmbd: remove unused compression negotiate ctx packing) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'recursive' strategy. + fs/ksmbd/smb2pdu.c | 79 +++++++++++++++++++----------------------------------- + 1 file changed, 28 insertions(+), 51 deletions(-) +Merging nfs/linux-next (e8d018dd0257f Linux 6.3-rc3) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (943d045a6d796 SUNRPC: fix shutdown of NFS TCP client socket) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (dcf700e2b6b4c SUNRPC: Ignore return value of ->xpo_sendto) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/Makefile | 6 +- + fs/lockd/clntlock.c | 58 +++--- + fs/lockd/clntproc.c | 42 +++- + fs/lockd/host.c | 1 + + fs/lockd/svclock.c | 21 +- + fs/lockd/trace.c | 3 + + fs/lockd/trace.h | 106 ++++++++++ + fs/nfs/export.c | 9 +- + fs/nfs/internal.h | 15 -- + fs/nfsd/export.c | 13 +- + fs/nfsd/filecache.c | 427 ++++++++++++++++---------------------- + fs/nfsd/filecache.h | 9 +- + fs/nfsd/nfs4idmap.c | 8 +- + fs/nfsd/vfs.c | 6 +- + include/linux/exportfs.h | 1 + + include/linux/lockd/lockd.h | 29 +-- + include/linux/nfs.h | 20 ++ + include/linux/sunrpc/cache.h | 15 +- + include/linux/sunrpc/svc.h | 4 +- + include/linux/sunrpc/svcsock.h | 2 +- + include/trace/events/sunrpc.h | 25 +++ + net/sunrpc/auth_gss/svcauth_gss.c | 12 +- + net/sunrpc/svc.c | 28 ++- + net/sunrpc/svc_xprt.c | 21 +- + net/sunrpc/svcauth_unix.c | 12 +- + net/sunrpc/svcsock.c | 25 ++- + net/sunrpc/xprtrdma/svc_rdma.c | 21 +- + 27 files changed, 532 insertions(+), 407 deletions(-) + create mode 100644 fs/lockd/trace.c + create mode 100644 fs/lockd/trace.h +Merging ntfs3/master (788ee1605c2e9 fs/ntfs3: Fix root inode checking) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/xattr.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/ntfs3.rst | 11 -- + fs/ntfs3/attrib.c | 17 +- + fs/ntfs3/bitmap.c | 25 +-- + fs/ntfs3/file.c | 50 +++--- + fs/ntfs3/frecord.c | 46 +++--- + fs/ntfs3/fslog.c | 83 +++++----- + fs/ntfs3/fsntfs.c | 84 +++++----- + fs/ntfs3/index.c | 81 +++++++--- + fs/ntfs3/inode.c | 134 +++++++++------- + fs/ntfs3/lznt.c | 10 +- + fs/ntfs3/namei.c | 19 ++- + fs/ntfs3/ntfs.h | 3 - + fs/ntfs3/ntfs_fs.h | 19 +-- + fs/ntfs3/record.c | 15 +- + fs/ntfs3/run.c | 6 +- + fs/ntfs3/super.c | 312 +++++++++++++++++++++--------------- + fs/ntfs3/xattr.c | 70 +++----- + 17 files changed, 528 insertions(+), 457 deletions(-) +Merging orangefs/for-next (31720a2b109b3 orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (4f11ada10d0ad ovl: fail on invalid uid/gid mapping at copy up) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (1e020e1b96afd ubi: Fix failure attaching when vid_hdr offset equals to (sub)page size) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/build.c | 21 +++++++++++++++------ + drivers/mtd/ubi/wl.c | 4 ++-- + 2 files changed, 17 insertions(+), 8 deletions(-) +Merging v9fs/9p-next (4ec5183ec4865 Linux 6.2-rc7) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (4eb3117888a92 fs/9p: Rework cache modes and add new options to Documentation) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/9p.rst | 52 +++++++--- + fs/9p/cache.h | 3 +- + fs/9p/fid.c | 48 ++++----- + fs/9p/fid.h | 31 +++++- + fs/9p/v9fs.c | 59 +++++------ + fs/9p/v9fs.h | 62 ++++++++---- + fs/9p/v9fs_vfs.h | 4 - + fs/9p/vfs_addr.c | 50 +++++----- + fs/9p/vfs_dir.c | 10 +- + fs/9p/vfs_file.c | 206 ++++++++------------------------------- + fs/9p/vfs_inode.c | 111 +++++++++++---------- + fs/9p/vfs_inode_dotl.c | 90 +++++++++-------- + fs/9p/vfs_super.c | 44 +++------ + include/net/9p/9p.h | 6 ++ + net/9p/client.c | 8 +- + 15 files changed, 368 insertions(+), 416 deletions(-) +Merging xfs/for-next (798352cb25d2c Merge tag 'fix-asciici-bugs-6.4_2023-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into guilt/xfs-for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/xfs.rst | 1 + + Documentation/filesystems/index.rst | 1 + + .../filesystems/xfs-online-fsck-design.rst | 5315 ++++++++++++++++++++ + .../filesystems/xfs-self-describing-metadata.rst | 1 + + fs/xfs/Kconfig | 32 + + fs/xfs/Makefile | 5 +- + fs/xfs/libxfs/xfs_ag.c | 23 +- + fs/xfs/libxfs/xfs_ag.h | 9 + + fs/xfs/libxfs/xfs_alloc.c | 115 +- + fs/xfs/libxfs/xfs_alloc.h | 22 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 32 +- + fs/xfs/libxfs/xfs_bmap.c | 38 +- + fs/xfs/libxfs/xfs_bmap.h | 8 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 19 +- + fs/xfs/libxfs/xfs_btree.c | 204 +- + fs/xfs/libxfs/xfs_btree.h | 141 +- + fs/xfs/libxfs/xfs_defer.c | 6 +- + fs/xfs/libxfs/xfs_dir2.c | 5 +- + fs/xfs/libxfs/xfs_dir2.h | 31 + + fs/xfs/libxfs/xfs_ialloc.c | 165 +- + fs/xfs/libxfs/xfs_ialloc.h | 7 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 35 +- + fs/xfs/libxfs/xfs_ialloc_btree.h | 2 +- + fs/xfs/libxfs/xfs_inode_fork.c | 19 +- + fs/xfs/libxfs/xfs_inode_fork.h | 6 +- + fs/xfs/libxfs/xfs_refcount.c | 117 +- + fs/xfs/libxfs/xfs_refcount.h | 10 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 31 +- + fs/xfs/libxfs/xfs_rmap.c | 358 +- + fs/xfs/libxfs/xfs_rmap.h | 38 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 102 +- + fs/xfs/libxfs/xfs_sb.c | 11 +- + fs/xfs/libxfs/xfs_types.h | 12 + + fs/xfs/scrub/agheader.c | 30 +- + fs/xfs/scrub/agheader_repair.c | 105 +- + fs/xfs/scrub/alloc.c | 69 +- + fs/xfs/scrub/attr.c | 312 +- + fs/xfs/scrub/attr.h | 64 +- + fs/xfs/scrub/bitmap.c | 428 +- + fs/xfs/scrub/bitmap.h | 111 +- + fs/xfs/scrub/bmap.c | 420 +- + fs/xfs/scrub/btree.c | 102 +- + fs/xfs/scrub/btree.h | 16 +- + fs/xfs/scrub/common.c | 465 +- + fs/xfs/scrub/common.h | 32 +- + fs/xfs/scrub/dabtree.c | 7 +- + fs/xfs/scrub/dabtree.h | 6 +- + fs/xfs/scrub/dir.c | 246 +- + fs/xfs/scrub/fscounters.c | 11 +- + fs/xfs/scrub/health.c | 8 +- + fs/xfs/scrub/health.h | 6 +- + fs/xfs/scrub/ialloc.c | 304 +- + fs/xfs/scrub/inode.c | 189 +- + fs/xfs/scrub/parent.c | 300 +- + fs/xfs/scrub/quota.c | 9 +- + fs/xfs/scrub/readdir.c | 375 ++ + fs/xfs/scrub/readdir.h | 19 + + fs/xfs/scrub/refcount.c | 193 +- + fs/xfs/scrub/repair.c | 112 +- + fs/xfs/scrub/repair.h | 7 +- + fs/xfs/scrub/rmap.c | 570 ++- + fs/xfs/scrub/rtbitmap.c | 6 +- + fs/xfs/scrub/scrub.c | 74 +- + fs/xfs/scrub/scrub.h | 32 +- + fs/xfs/scrub/symlink.c | 6 +- + fs/xfs/scrub/trace.c | 6 +- + fs/xfs/scrub/trace.h | 75 +- + fs/xfs/scrub/xfs_scrub.h | 6 +- + fs/xfs/xfs_bmap_item.c | 37 +- + fs/xfs/xfs_bmap_util.c | 14 +- + fs/xfs/xfs_buf_item_recover.c | 10 + + fs/xfs/xfs_dahash_test.c | 211 +- + fs/xfs/xfs_dquot.c | 1 - + fs/xfs/xfs_drain.c | 166 + + fs/xfs/xfs_drain.h | 87 + + fs/xfs/xfs_extfree_item.c | 54 +- + fs/xfs/xfs_icache.c | 3 +- + fs/xfs/xfs_icache.h | 11 +- + fs/xfs/xfs_iunlink_item.c | 4 +- + fs/xfs/xfs_iwalk.c | 5 +- + fs/xfs/xfs_linux.h | 1 + + fs/xfs/xfs_refcount_item.c | 36 +- + fs/xfs/xfs_rmap_item.c | 32 +- + fs/xfs/xfs_super.c | 13 + + fs/xfs/xfs_trace.h | 72 + + 85 files changed, 10516 insertions(+), 1883 deletions(-) + create mode 100644 Documentation/filesystems/xfs-online-fsck-design.rst + create mode 100644 fs/xfs/scrub/readdir.c + create mode 100644 fs/xfs/scrub/readdir.h + create mode 100644 fs/xfs/xfs_drain.c + create mode 100644 fs/xfs/xfs_drain.h +Merging zonefs/for-next (2b188a2cfc4d8 zonefs: make kobj_type structure constant) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (471859f57d425 iomap: Rename page_ops to folio_ops) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (a79168a0c00d7 fs/remap_range: avoid spurious writeback on zero length request) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (63355b9884b3d cpumask: be more careful with 'cpumask_setall()') +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (63355b9884b3d cpumask: be more careful with 'cpumask_setall()') +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs/for-next (d291d18584199 Merge branch 'work.fd' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/fs.h +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/namespace.c +Auto-merging fs/fuse/dev.c +Merge made by the 'recursive' strategy. + arch/nios2/include/asm/thread_info.h | 3 --- + arch/x86/kernel/cpu/sgx/main.c | 11 +++++----- + arch/x86/kvm/svm/sev.c | 26 ++++++++++++----------- + fs/direct-io.c | 9 ++------ + fs/fuse/dev.c | 41 ++++++++++++++++++------------------ + fs/namei.c | 4 ++-- + fs/namespace.c | 12 +++++------ + fs/nsfs.c | 18 ---------------- + fs/ocfs2/aops.c | 2 +- + fs/sysv/dir.c | 28 ++++++++++-------------- + fs/sysv/namei.c | 8 +++---- + fs/sysv/sysv.h | 1 - + include/linux/fs.h | 4 ++-- + include/linux/proc_ns.h | 1 - + kernel/bpf/bpf_inode_storage.c | 38 +++++++++++++-------------------- + kernel/cgroup/cgroup.c | 10 ++++----- + kernel/nsproxy.c | 17 +++++++-------- + net/core/net_namespace.c | 23 ++++++++++---------- + 18 files changed, 106 insertions(+), 150 deletions(-) +Merging printk/for-next (16bff6f075a10 Merge branch 'for-6.4' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging lib/vsprintf.c +Auto-merging kernel/printk/printk.c +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + arch/powerpc/configs/microwatt_defconfig | 1 - + arch/riscv/configs/nommu_k210_defconfig | 1 - + arch/riscv/configs/nommu_k210_sdcard_defconfig | 1 - + arch/riscv/configs/nommu_virt_defconfig | 1 - + init/Kconfig | 24 ------------------------ + kernel/printk/printk.c | 13 +------------ + lib/vsprintf.c | 2 +- + 7 files changed, 2 insertions(+), 41 deletions(-) +Merging pci/next (be829256e322f Merge branch 'pci/controller/rcar') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/remove.c +Auto-merging drivers/pci/bus.c +Auto-merging arch/powerpc/platforms/4xx/pci.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt +Merge made by the 'recursive' strategy. + .clang-format | 1 + + .../devicetree/bindings/pci/amlogic,axg-pcie.yaml | 134 ++++++++++ + .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 70 ------ + .../bindings/pci/fsl,imx6q-pcie-common.yaml | 279 +++++++++++++++++++++ + .../devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml | 85 +++++++ + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 240 +----------------- + MAINTAINERS | 2 + + arch/alpha/kernel/pci.c | 5 +- + arch/arm/kernel/bios32.c | 16 +- + arch/arm/mach-dove/pcie.c | 10 +- + arch/arm/mach-mv78xx0/pcie.c | 10 +- + arch/arm/mach-orion5x/pci.c | 10 +- + arch/mips/pci/ops-bcm63xx.c | 8 +- + arch/mips/pci/pci-legacy.c | 3 +- + arch/powerpc/kernel/pci-common.c | 21 +- + arch/powerpc/platforms/4xx/pci.c | 8 +- + arch/powerpc/platforms/52xx/mpc52xx_pci.c | 5 +- + arch/powerpc/platforms/pseries/pci.c | 16 +- + arch/sh/drivers/pci/pcie-sh7786.c | 10 +- + arch/sparc/kernel/leon_pci.c | 5 +- + arch/sparc/kernel/pci.c | 10 +- + arch/sparc/kernel/pcic.c | 5 +- + drivers/eisa/pci_eisa.c | 4 +- + drivers/firmware/efi/cper-arm.c | 1 - + drivers/pci/bus.c | 7 +- + drivers/pci/controller/dwc/Kconfig | 1 + + drivers/pci/controller/dwc/pci-imx6.c | 7 + + drivers/pci/controller/dwc/pci-layerscape-ep.c | 1 + + drivers/pci/controller/pci-ixp4xx.c | 10 +- + drivers/pci/controller/pcie-mt7621.c | 4 +- + drivers/pci/controller/pcie-rcar-host.c | 4 +- + drivers/pci/controller/pcie-rcar.h | 2 +- + drivers/pci/hotplug/shpchp_sysfs.c | 8 +- + drivers/pci/p2pdma.c | 3 +- + drivers/pci/pci.c | 3 +- + drivers/pci/probe.c | 2 +- + drivers/pci/remove.c | 5 +- + drivers/pci/setup-bus.c | 37 ++- + drivers/pci/setup-res.c | 4 +- + drivers/pci/vgaarb.c | 17 +- + drivers/pci/xen-pcifront.c | 4 +- + drivers/pnp/quirks.c | 29 +-- + include/linux/pci.h | 71 +++++- + 43 files changed, 698 insertions(+), 479 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml + create mode 100644 Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml +Merging pstore/for-next/pstore (5239a89b06d6b pstore: Revert pmsg_lock back to a normal mutex) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/pmsg.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +Merging hid/for-next (7a17f42d376ee Merge branch 'for-6.4/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-usb | 17 + + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 1 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 13 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 1 + + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 4 + + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c | 2 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 11 + + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 10 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h | 8 +- + drivers/hid/hid-apple.c | 20 +- + drivers/hid/hid-asus.c | 1 + + drivers/hid/hid-ids.h | 10 +- + drivers/hid/hid-input.c | 12 + + drivers/hid/hid-kye.c | 924 ++++----- + drivers/hid/hid-lg-g15.c | 1 + + drivers/hid/hid-logitech-hidpp.c | 256 ++- + drivers/hid/hid-mcp2221.c | 6 +- + drivers/hid/hid-nintendo.c | 95 +- + drivers/hid/hid-quirks.c | 14 +- + drivers/hid/hid-steelseries.c | 1 + + drivers/hid/i2c-hid/Kconfig | 6 +- + drivers/hid/i2c-hid/i2c-hid-of.c | 38 +- + drivers/hid/wacom_wac.c | 38 +- + drivers/hid/wacom_wac.h | 1 + + drivers/usb/core/message.c | 40 + + drivers/usb/core/sysfs.c | 50 + + drivers/usb/core/usb.h | 1 + + include/linux/hid.h | 3 +- + include/linux/usb.h | 16 + + tools/testing/selftests/hid/Makefile | 12 + + tools/testing/selftests/hid/config | 11 + + tools/testing/selftests/hid/hid-apple.sh | 7 + + tools/testing/selftests/hid/hid-core.sh | 7 + + tools/testing/selftests/hid/hid-gamepad.sh | 7 + + tools/testing/selftests/hid/hid-ite.sh | 7 + + tools/testing/selftests/hid/hid-keyboard.sh | 7 + + tools/testing/selftests/hid/hid-mouse.sh | 7 + + tools/testing/selftests/hid/hid-multitouch.sh | 7 + + tools/testing/selftests/hid/hid-sony.sh | 7 + + tools/testing/selftests/hid/hid-tablet.sh | 7 + + tools/testing/selftests/hid/hid-usb_crash.sh | 7 + + tools/testing/selftests/hid/hid-wacom.sh | 7 + + tools/testing/selftests/hid/run-hid-tools-tests.sh | 28 + + tools/testing/selftests/hid/settings | 3 + + tools/testing/selftests/hid/tests/__init__.py | 2 + + tools/testing/selftests/hid/tests/base.py | 345 ++++ + tools/testing/selftests/hid/tests/conftest.py | 81 + + .../selftests/hid/tests/descriptors_wacom.py | 1360 +++++++++++++ + .../selftests/hid/tests/test_apple_keyboard.py | 440 +++++ + tools/testing/selftests/hid/tests/test_gamepad.py | 209 ++ + tools/testing/selftests/hid/tests/test_hid_core.py | 154 ++ + .../selftests/hid/tests/test_ite_keyboard.py | 166 ++ + tools/testing/selftests/hid/tests/test_keyboard.py | 485 +++++ + tools/testing/selftests/hid/tests/test_mouse.py | 977 +++++++++ + .../testing/selftests/hid/tests/test_multitouch.py | 2088 ++++++++++++++++++++ + tools/testing/selftests/hid/tests/test_sony.py | 342 ++++ + tools/testing/selftests/hid/tests/test_tablet.py | 872 ++++++++ + .../testing/selftests/hid/tests/test_usb_crash.py | 103 + + .../selftests/hid/tests/test_wacom_generic.py | 844 ++++++++ + tools/testing/selftests/hid/vmtest.sh | 25 +- + 60 files changed, 9639 insertions(+), 585 deletions(-) + create mode 100755 tools/testing/selftests/hid/hid-apple.sh + create mode 100755 tools/testing/selftests/hid/hid-core.sh + create mode 100755 tools/testing/selftests/hid/hid-gamepad.sh + create mode 100755 tools/testing/selftests/hid/hid-ite.sh + create mode 100755 tools/testing/selftests/hid/hid-keyboard.sh + create mode 100755 tools/testing/selftests/hid/hid-mouse.sh + create mode 100755 tools/testing/selftests/hid/hid-multitouch.sh + create mode 100755 tools/testing/selftests/hid/hid-sony.sh + create mode 100755 tools/testing/selftests/hid/hid-tablet.sh + create mode 100755 tools/testing/selftests/hid/hid-usb_crash.sh + create mode 100755 tools/testing/selftests/hid/hid-wacom.sh + create mode 100755 tools/testing/selftests/hid/run-hid-tools-tests.sh + create mode 100644 tools/testing/selftests/hid/settings + create mode 100644 tools/testing/selftests/hid/tests/__init__.py + create mode 100644 tools/testing/selftests/hid/tests/base.py + create mode 100644 tools/testing/selftests/hid/tests/conftest.py + create mode 100644 tools/testing/selftests/hid/tests/descriptors_wacom.py + create mode 100644 tools/testing/selftests/hid/tests/test_apple_keyboard.py + create mode 100644 tools/testing/selftests/hid/tests/test_gamepad.py + create mode 100644 tools/testing/selftests/hid/tests/test_hid_core.py + create mode 100644 tools/testing/selftests/hid/tests/test_ite_keyboard.py + create mode 100644 tools/testing/selftests/hid/tests/test_keyboard.py + create mode 100644 tools/testing/selftests/hid/tests/test_mouse.py + create mode 100644 tools/testing/selftests/hid/tests/test_multitouch.py + create mode 100644 tools/testing/selftests/hid/tests/test_sony.py + create mode 100644 tools/testing/selftests/hid/tests/test_tablet.py + create mode 100644 tools/testing/selftests/hid/tests/test_usb_crash.py + create mode 100644 tools/testing/selftests/hid/tests/test_wacom_generic.py +Merging i2c/i2c/for-next (11e6592f3c50d Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging drivers/i2c/i2c-core-of.c +Auto-merging Documentation/devicetree/bindings/i2c/apple,i2c.yaml +Merge made by the 'recursive' strategy. + .../bindings/i2c/amlogic,meson6-i2c.yaml | 4 +- + .../devicetree/bindings/i2c/apple,i2c.yaml | 4 +- + .../devicetree/bindings/i2c/atmel,at91sam-i2c.yaml | 2 +- + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 16 ++- + Documentation/devicetree/bindings/i2c/i2c-mpc.yaml | 3 +- + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 5 + + .../devicetree/bindings/i2c/i2c-mux-gpio.yaml | 4 +- + .../bindings/i2c/qcom,i2c-geni-qcom.yaml | 4 +- + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 2 +- + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 4 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-brcmstb.c | 4 +- + drivers/i2c/busses/i2c-cadence.c | 111 ++++++++++++++++----- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 4 +- + drivers/i2c/busses/i2c-davinci.c | 5 +- + drivers/i2c/busses/i2c-imx.c | 12 +-- + drivers/i2c/busses/i2c-mchp-pci1xxxx.c | 60 +++++------ + drivers/i2c/busses/i2c-mpc.c | 37 ++++--- + drivers/i2c/busses/i2c-mt65xx.c | 15 ++- + drivers/i2c/busses/i2c-ocores.c | 35 ++++--- + drivers/i2c/busses/i2c-omap.c | 9 +- + drivers/i2c/busses/i2c-owl.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 6 +- + drivers/i2c/busses/i2c-synquacer.c | 2 +- + drivers/i2c/busses/i2c-xiic.c | 5 +- + drivers/i2c/i2c-core-of.c | 2 +- + 26 files changed, 223 insertions(+), 136 deletions(-) +Merging i3c/i3c/next (2810f1de814ad i3c: svc: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'recursive' strategy. + drivers/i3c/master.c | 6 +----- + drivers/i3c/master/dw-i3c-master.c | 13 ++++--------- + drivers/i3c/master/i3c-master-cdns.c | 11 +++-------- + drivers/i3c/master/mipi-i3c-hci/core.c | 6 +++--- + drivers/i3c/master/svc-i3c-master.c | 11 +++-------- + include/linux/i3c/master.h | 5 +++-- + 6 files changed, 17 insertions(+), 35 deletions(-) +Merging dmi/dmi-for-next (13a0ac816d22a firmware: dmi: Fortify entry point length checks) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (04dc3c9e432a6 hwmon: (nct6775) update ASUS WMI monitoring list A620/B760/W790) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/pwm-fan.txt | 68 +--- + .../devicetree/bindings/hwmon/pwm-fan.yaml | 97 ++++++ + .../bindings/hwmon/starfive,jh71x0-temp.yaml | 70 ++++ + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 5 + + .../devicetree/bindings/hwmon/ti,tmp464.yaml | 2 +- + Documentation/hwmon/aquacomputer_d5next.rst | 5 +- + Documentation/hwmon/asus_ec_sensors.rst | 2 + + Documentation/hwmon/ftsteutates.rst | 6 +- + Documentation/hwmon/hwmon-kernel-api.rst | 66 ++-- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/sfctemp.rst | 33 ++ + Documentation/hwmon/sysfs-interface.rst | 2 +- + MAINTAINERS | 9 +- + drivers/accel/habanalabs/common/hwmon.c | 2 +- + drivers/hwmon/Kconfig | 12 +- + drivers/hwmon/Makefile | 3 +- + drivers/hwmon/adm1177.c | 2 +- + drivers/hwmon/adm9240.c | 2 +- + drivers/hwmon/adt7411.c | 2 +- + drivers/hwmon/adt7470.c | 2 +- + drivers/hwmon/adt7x10.c | 2 +- + drivers/hwmon/aht10.c | 2 +- + drivers/hwmon/aquacomputer_d5next.c | 185 +++++++++-- + drivers/hwmon/as370-hwmon.c | 2 +- + drivers/hwmon/asus-ec-sensors.c | 20 ++ + drivers/hwmon/axi-fan-control.c | 2 +- + drivers/hwmon/bt1-pvt.c | 4 +- + drivers/hwmon/coretemp.c | 8 +- + drivers/hwmon/corsair-cpro.c | 2 +- + drivers/hwmon/corsair-psu.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 2 +- + drivers/hwmon/drivetemp.c | 2 +- + drivers/hwmon/emc2305.c | 2 +- + drivers/hwmon/ftsteutates.c | 2 +- + drivers/hwmon/g762.c | 7 +- + drivers/hwmon/gpio-fan.c | 2 +- + drivers/hwmon/gxp-fan-ctrl.c | 2 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/i5500_temp.c | 2 +- + drivers/hwmon/ibmpowernv.c | 4 +- + drivers/hwmon/ina238.c | 2 +- + drivers/hwmon/ina2xx.c | 4 + + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/intel-m10-bmc-hwmon.c | 10 +- + drivers/hwmon/it87.c | 2 +- + drivers/hwmon/jc42.c | 2 +- + drivers/hwmon/k10temp.c | 2 +- + drivers/hwmon/k8temp.c | 2 +- + drivers/hwmon/lan966x-hwmon.c | 2 +- + drivers/hwmon/lm75.c | 2 +- + drivers/hwmon/lm83.c | 2 +- + drivers/hwmon/lm95241.c | 2 +- + drivers/hwmon/lm95245.c | 2 +- + drivers/hwmon/lochnagar-hwmon.c | 2 +- + drivers/hwmon/ltc2947-core.c | 2 +- + drivers/hwmon/ltc2992.c | 2 +- + drivers/hwmon/ltc4245.c | 4 +- + drivers/hwmon/ltq-cputemp.c | 2 +- + drivers/hwmon/max127.c | 2 +- + drivers/hwmon/max31730.c | 2 +- + drivers/hwmon/max31760.c | 2 +- + drivers/hwmon/max31790.c | 2 +- + drivers/hwmon/max6620.c | 2 +- + drivers/hwmon/max6621.c | 2 +- + drivers/hwmon/max6650.c | 2 +- + drivers/hwmon/mc34vr500.c | 2 +- + drivers/hwmon/mcp3021.c | 2 +- + drivers/hwmon/mlxreg-fan.c | 2 +- + drivers/hwmon/nct6775-platform.c | 293 ++++++++++++++++- + drivers/hwmon/nct7904.c | 2 +- + drivers/hwmon/npcm750-pwm-fan.c | 2 +- + drivers/hwmon/ntc_thermistor.c | 2 +- + drivers/hwmon/nzxt-kraken2.c | 2 +- + drivers/hwmon/nzxt-smart2.c | 15 +- + drivers/hwmon/oxp-sensors.c | 2 +- + drivers/hwmon/peci/cputemp.c | 2 +- + drivers/hwmon/peci/dimmtemp.c | 2 +- + drivers/hwmon/pmbus/pmbus.h | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 363 +++++++++++++++------ + drivers/hwmon/powr1220.c | 2 +- + drivers/hwmon/pwm-fan.c | 10 +- + drivers/hwmon/raspberrypi-hwmon.c | 2 +- + drivers/hwmon/sbrmi.c | 2 +- + drivers/hwmon/sbtsi_temp.c | 2 +- + drivers/hwmon/sch5627.c | 2 +- + drivers/hwmon/sfctemp.c | 331 +++++++++++++++++++ + drivers/hwmon/sht4x.c | 2 +- + drivers/hwmon/sl28cpld-hwmon.c | 2 +- + drivers/hwmon/smpro-hwmon.c | 2 +- + drivers/hwmon/sparx5-temp.c | 2 +- + drivers/hwmon/sy7636a-hwmon.c | 2 +- + drivers/hwmon/tmp102.c | 2 +- + drivers/hwmon/tmp103.c | 2 +- + drivers/hwmon/tmp108.c | 2 +- + drivers/hwmon/tmp464.c | 2 +- + drivers/hwmon/tmp513.c | 2 +- + drivers/hwmon/tps23861.c | 2 +- + drivers/hwmon/vt1211.c | 6 - + drivers/hwmon/w83627ehf.c | 2 +- + drivers/hwmon/w83773g.c | 2 +- + include/linux/hwmon.h | 2 +- + 101 files changed, 1428 insertions(+), 361 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/pwm-fan.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml + create mode 100644 Documentation/hwmon/sfctemp.rst + create mode 100644 drivers/hwmon/sfctemp.c +$ git am -3 ../patches/0001-hwmon-emc2305-fix-up-for-i2c-Make-remove-callback-re.patch +Applying: hwmon: (emc2305) fix up for "i2c: Make remove callback return void" +Using index info to reconstruct a base tree... +M drivers/hwmon/emc2305.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/hwmon/emc2305.c +No changes -- Patch already applied. +Merging jc_docs/docs-next (b645fc696bec7 Documentation: firmware: Clarify firmware path usage) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Removing fs/qnx6/README +Removing fs/qnx4/README +Auto-merging drivers/vhost/vhost.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/m68k/Kconfig.machine +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging Documentation/translations/it_IT/process/submitting-patches.rst +Auto-merging Documentation/process/index.rst +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/index.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/index.rst +Resolved 'Documentation/admin-guide/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e37044235117a] Merge branch 'docs-next' of git://git.lwn.net/linux.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 16 + + Documentation/admin-guide/hw-vuln/mds.rst | 2 +- + .../admin-guide/hw-vuln/tsx_async_abort.rst | 2 +- + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.rst | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 341 +++--- + .../admin-guide/quickly-build-trimmed-linux.rst | 1092 ++++++++++++++++++++ + Documentation/admin-guide/ras.rst | 2 +- + Documentation/admin-guide/sysctl/kernel.rst | 4 +- + Documentation/admin-guide/unicode.rst | 9 +- + Documentation/{ => arch}/arc/arc.rst | 0 + Documentation/{ => arch}/arc/features.rst | 0 + Documentation/{ => arch}/arc/index.rst | 0 + Documentation/{ => arch}/ia64/aliasing.rst | 0 + Documentation/{ => arch}/ia64/efirtc.rst | 0 + Documentation/{ => arch}/ia64/err_inject.rst | 0 + Documentation/{ => arch}/ia64/features.rst | 0 + Documentation/{ => arch}/ia64/fsys.rst | 0 + Documentation/{ => arch}/ia64/ia64.rst | 0 + Documentation/{ => arch}/ia64/index.rst | 0 + Documentation/{ => arch}/ia64/irq-redir.rst | 0 + Documentation/{ => arch}/ia64/mca.rst | 0 + Documentation/{ => arch}/ia64/serial.rst | 0 + Documentation/{arch.rst => arch/index.rst} | 14 +- + Documentation/{ => arch}/m68k/buddha-driver.rst | 0 + Documentation/{ => arch}/m68k/features.rst | 0 + Documentation/{ => arch}/m68k/index.rst | 0 + Documentation/{ => arch}/m68k/kernel-options.rst | 0 + Documentation/{ => arch}/nios2/features.rst | 0 + Documentation/{ => arch}/nios2/index.rst | 0 + Documentation/{ => arch}/nios2/nios2.rst | 0 + Documentation/{ => arch}/openrisc/features.rst | 0 + Documentation/{ => arch}/openrisc/index.rst | 0 + .../{ => arch}/openrisc/openrisc_port.rst | 0 + Documentation/{ => arch}/openrisc/todo.rst | 0 + Documentation/{ => arch}/parisc/debugging.rst | 0 + Documentation/{ => arch}/parisc/features.rst | 0 + Documentation/{ => arch}/parisc/index.rst | 0 + Documentation/{ => arch}/parisc/registers.rst | 0 + Documentation/{ => arch}/sh/booting.rst | 0 + Documentation/{ => arch}/sh/features.rst | 0 + Documentation/{ => arch}/sh/index.rst | 0 + Documentation/{ => arch}/sh/new-machine.rst | 0 + Documentation/{ => arch}/sh/register-banks.rst | 0 + Documentation/{ => arch}/sparc/adi.rst | 0 + Documentation/{ => arch}/sparc/console.rst | 0 + Documentation/{ => arch}/sparc/features.rst | 0 + Documentation/{ => arch}/sparc/index.rst | 0 + .../{ => arch}/sparc/oradax/dax-hv-api.txt | 0 + .../{ => arch}/sparc/oradax/oracle-dax.rst | 0 + .../{ => arch}/x86/amd-memory-encryption.rst | 0 + Documentation/{ => arch}/x86/amd_hsmp.rst | 0 + Documentation/{ => arch}/x86/boot.rst | 4 +- + Documentation/{ => arch}/x86/booting-dt.rst | 2 +- + Documentation/{ => arch}/x86/buslock.rst | 10 +- + Documentation/{ => arch}/x86/cpuinfo.rst | 0 + Documentation/{ => arch}/x86/earlyprintk.rst | 0 + Documentation/{ => arch}/x86/elf_auxvec.rst | 0 + Documentation/{ => arch}/x86/entry_64.rst | 0 + Documentation/{ => arch}/x86/exception-tables.rst | 0 + Documentation/{ => arch}/x86/features.rst | 0 + Documentation/{ => arch}/x86/i386/IO-APIC.rst | 0 + Documentation/{ => arch}/x86/i386/index.rst | 0 + Documentation/{ => arch}/x86/ifs.rst | 0 + Documentation/{ => arch}/x86/index.rst | 0 + Documentation/{ => arch}/x86/intel-hfi.rst | 0 + Documentation/{ => arch}/x86/intel_txt.rst | 0 + Documentation/{ => arch}/x86/iommu.rst | 0 + Documentation/{ => arch}/x86/kernel-stacks.rst | 0 + Documentation/{ => arch}/x86/mds.rst | 0 + Documentation/{ => arch}/x86/microcode.rst | 0 + Documentation/{ => arch}/x86/mtrr.rst | 2 +- + Documentation/{ => arch}/x86/orc-unwinder.rst | 0 + Documentation/{ => arch}/x86/pat.rst | 0 + Documentation/{ => arch}/x86/pti.rst | 0 + Documentation/{ => arch}/x86/resctrl.rst | 0 + Documentation/{ => arch}/x86/sgx.rst | 0 + Documentation/{ => arch}/x86/sva.rst | 0 + Documentation/{ => arch}/x86/tdx.rst | 0 + Documentation/{ => arch}/x86/tlb.rst | 0 + Documentation/{ => arch}/x86/topology.rst | 0 + Documentation/{ => arch}/x86/tsx_async_abort.rst | 0 + .../{ => arch}/x86/usb-legacy-support.rst | 0 + .../{ => arch}/x86/x86_64/5level-paging.rst | 2 +- + .../{ => arch}/x86/x86_64/boot-options.rst | 4 +- + .../{ => arch}/x86/x86_64/cpu-hotplug-spec.rst | 0 + .../x86/x86_64/fake-numa-for-cpusets.rst | 2 +- + Documentation/{ => arch}/x86/x86_64/fsgs.rst | 0 + Documentation/{ => arch}/x86/x86_64/index.rst | 0 + .../{ => arch}/x86/x86_64/machinecheck.rst | 0 + Documentation/{ => arch}/x86/x86_64/mm.rst | 0 + Documentation/{ => arch}/x86/x86_64/uefi.rst | 0 + Documentation/{ => arch}/x86/xstate.rst | 0 + Documentation/{ => arch}/x86/zero-page.rst | 0 + Documentation/{ => arch}/xtensa/atomctl.rst | 0 + Documentation/{ => arch}/xtensa/booting.rst | 0 + Documentation/{ => arch}/xtensa/features.rst | 0 + Documentation/{ => arch}/xtensa/index.rst | 0 + Documentation/{ => arch}/xtensa/mmu.rst | 0 + Documentation/core-api/asm-annotations.rst | 2 +- + Documentation/core-api/dma-api-howto.rst | 2 +- + Documentation/driver-api/device-io.rst | 2 +- + .../driver-api/firmware/fw_search_path.rst | 9 +- + Documentation/filesystems/proc.rst | 44 +- + Documentation/filesystems/vfs.rst | 105 +- + Documentation/index.rst | 2 +- + Documentation/kernel-hacking/false-sharing.rst | 206 ++++ + Documentation/kernel-hacking/index.rst | 1 + + Documentation/mm/physical_memory.rst | 21 +- + Documentation/process/coding-style.rst | 2 +- + .../process/contribution-maturity-model.rst | 109 ++ + Documentation/process/index.rst | 1 + + Documentation/process/kernel-docs.rst | 36 +- + Documentation/process/maintainer-tip.rst | 4 +- + .../it_IT/core-api/symbol-namespaces.rst | 3 +- + .../translations/it_IT/doc-guide/parse-headers.rst | 5 +- + Documentation/translations/it_IT/index.rst | 47 +- + .../translations/it_IT/kernel-hacking/locking.rst | 5 + + .../translations/it_IT/process/5.Posting.rst | 13 +- + .../translations/it_IT/process/changes.rst | 4 +- + .../translations/it_IT/process/clang-format.rst | 2 +- + .../translations/it_IT/process/coding-style.rst | 6 +- + .../translations/it_IT/process/deprecated.rst | 29 +- + .../translations/it_IT/process/email-clients.rst | 25 + + Documentation/translations/it_IT/process/index.rst | 1 + + .../it_IT/process/maintainer-pgp-guide.rst | 348 +++---- + .../it_IT/process/programming-language.rst | 25 +- + .../it_IT/process/stable-kernel-rules.rst | 6 + + .../it_IT/process/submitting-patches.rst | 4 +- + .../it_IT/process/volatile-considered-harmful.rst | 4 +- + .../translations/sp_SP/memory-barriers.txt | 2 +- + .../translations/sp_SP/process/deprecated.rst | 381 +++++++ + Documentation/translations/sp_SP/process/index.rst | 1 + + .../zh_CN/admin-guide/mm/damon/lru_sort.rst | 2 +- + .../zh_CN/{arch.rst => arch/index.rst} | 8 +- + .../zh_CN/{ => arch}/openrisc/index.rst | 4 +- + .../zh_CN/{ => arch}/openrisc/openrisc_port.rst | 4 +- + .../zh_CN/{ => arch}/openrisc/todo.rst | 4 +- + .../zh_CN/{ => arch}/parisc/debugging.rst | 4 +- + .../translations/zh_CN/{ => arch}/parisc/index.rst | 4 +- + .../zh_CN/{ => arch}/parisc/registers.rst | 4 +- + Documentation/translations/zh_CN/index.rst | 2 +- + Documentation/virt/kvm/api.rst | 2 +- + MAINTAINERS | 42 +- + arch/arm/Kconfig | 2 +- + arch/ia64/kernel/efi.c | 2 +- + arch/ia64/kernel/fsys.S | 2 +- + arch/ia64/mm/ioremap.c | 2 +- + arch/ia64/pci/pci.c | 2 +- + arch/m68k/Kconfig.machine | 4 +- + arch/sh/Kconfig.cpu | 2 +- + arch/x86/Kconfig | 10 +- + arch/x86/Kconfig.debug | 2 +- + arch/x86/boot/header.S | 2 +- + arch/x86/entry/entry_64.S | 2 +- + arch/x86/include/asm/bootparam_utils.h | 2 +- + arch/x86/include/asm/page_64_types.h | 2 +- + arch/x86/include/asm/pgtable_64_types.h | 2 +- + arch/x86/kernel/cpu/microcode/amd.c | 2 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 2 +- + arch/x86/kernel/cpu/sgx/sgx.h | 2 +- + arch/x86/kernel/kexec-bzimage64.c | 2 +- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/mm/pat/set_memory.c | 2 +- + arch/x86/mm/tlb.c | 2 +- + arch/x86/platform/pvh/enlighten.c | 2 +- + arch/xtensa/include/asm/initialize_mmu.h | 2 +- + drivers/sbus/char/oradax.c | 2 +- + drivers/vhost/vhost.c | 2 +- + fs/qnx4/README | 9 - + fs/qnx6/README | 8 - + security/Kconfig | 2 +- + tools/include/linux/err.h | 2 +- + tools/objtool/Documentation/objtool.txt | 2 +- + 174 files changed, 2564 insertions(+), 573 deletions(-) + create mode 100644 Documentation/admin-guide/quickly-build-trimmed-linux.rst + rename Documentation/{ => arch}/arc/arc.rst (100%) + rename Documentation/{ => arch}/arc/features.rst (100%) + rename Documentation/{ => arch}/arc/index.rst (100%) + rename Documentation/{ => arch}/ia64/aliasing.rst (100%) + rename Documentation/{ => arch}/ia64/efirtc.rst (100%) + rename Documentation/{ => arch}/ia64/err_inject.rst (100%) + rename Documentation/{ => arch}/ia64/features.rst (100%) + rename Documentation/{ => arch}/ia64/fsys.rst (100%) + rename Documentation/{ => arch}/ia64/ia64.rst (100%) + rename Documentation/{ => arch}/ia64/index.rst (100%) + rename Documentation/{ => arch}/ia64/irq-redir.rst (100%) + rename Documentation/{ => arch}/ia64/mca.rst (100%) + rename Documentation/{ => arch}/ia64/serial.rst (100%) + rename Documentation/{arch.rst => arch/index.rst} (72%) + rename Documentation/{ => arch}/m68k/buddha-driver.rst (100%) + rename Documentation/{ => arch}/m68k/features.rst (100%) + rename Documentation/{ => arch}/m68k/index.rst (100%) + rename Documentation/{ => arch}/m68k/kernel-options.rst (100%) + rename Documentation/{ => arch}/nios2/features.rst (100%) + rename Documentation/{ => arch}/nios2/index.rst (100%) + rename Documentation/{ => arch}/nios2/nios2.rst (100%) + rename Documentation/{ => arch}/openrisc/features.rst (100%) + rename Documentation/{ => arch}/openrisc/index.rst (100%) + rename Documentation/{ => arch}/openrisc/openrisc_port.rst (100%) + rename Documentation/{ => arch}/openrisc/todo.rst (100%) + rename Documentation/{ => arch}/parisc/debugging.rst (100%) + rename Documentation/{ => arch}/parisc/features.rst (100%) + rename Documentation/{ => arch}/parisc/index.rst (100%) + rename Documentation/{ => arch}/parisc/registers.rst (100%) + rename Documentation/{ => arch}/sh/booting.rst (100%) + rename Documentation/{ => arch}/sh/features.rst (100%) + rename Documentation/{ => arch}/sh/index.rst (100%) + rename Documentation/{ => arch}/sh/new-machine.rst (100%) + rename Documentation/{ => arch}/sh/register-banks.rst (100%) + rename Documentation/{ => arch}/sparc/adi.rst (100%) + rename Documentation/{ => arch}/sparc/console.rst (100%) + rename Documentation/{ => arch}/sparc/features.rst (100%) + rename Documentation/{ => arch}/sparc/index.rst (100%) + rename Documentation/{ => arch}/sparc/oradax/dax-hv-api.txt (100%) + rename Documentation/{ => arch}/sparc/oradax/oracle-dax.rst (100%) + rename Documentation/{ => arch}/x86/amd-memory-encryption.rst (100%) + rename Documentation/{ => arch}/x86/amd_hsmp.rst (100%) + rename Documentation/{ => arch}/x86/boot.rst (99%) + rename Documentation/{ => arch}/x86/booting-dt.rst (96%) + rename Documentation/{ => arch}/x86/buslock.rst (93%) + rename Documentation/{ => arch}/x86/cpuinfo.rst (100%) + rename Documentation/{ => arch}/x86/earlyprintk.rst (100%) + rename Documentation/{ => arch}/x86/elf_auxvec.rst (100%) + rename Documentation/{ => arch}/x86/entry_64.rst (100%) + rename Documentation/{ => arch}/x86/exception-tables.rst (100%) + rename Documentation/{ => arch}/x86/features.rst (100%) + rename Documentation/{ => arch}/x86/i386/IO-APIC.rst (100%) + rename Documentation/{ => arch}/x86/i386/index.rst (100%) + rename Documentation/{ => arch}/x86/ifs.rst (100%) + rename Documentation/{ => arch}/x86/index.rst (100%) + rename Documentation/{ => arch}/x86/intel-hfi.rst (100%) + rename Documentation/{ => arch}/x86/intel_txt.rst (100%) + rename Documentation/{ => arch}/x86/iommu.rst (100%) + rename Documentation/{ => arch}/x86/kernel-stacks.rst (100%) + rename Documentation/{ => arch}/x86/mds.rst (100%) + rename Documentation/{ => arch}/x86/microcode.rst (100%) + rename Documentation/{ => arch}/x86/mtrr.rst (99%) + rename Documentation/{ => arch}/x86/orc-unwinder.rst (100%) + rename Documentation/{ => arch}/x86/pat.rst (100%) + rename Documentation/{ => arch}/x86/pti.rst (100%) + rename Documentation/{ => arch}/x86/resctrl.rst (100%) + rename Documentation/{ => arch}/x86/sgx.rst (100%) + rename Documentation/{ => arch}/x86/sva.rst (100%) + rename Documentation/{ => arch}/x86/tdx.rst (100%) + rename Documentation/{ => arch}/x86/tlb.rst (100%) + rename Documentation/{ => arch}/x86/topology.rst (100%) + rename Documentation/{ => arch}/x86/tsx_async_abort.rst (100%) + rename Documentation/{ => arch}/x86/usb-legacy-support.rst (100%) + rename Documentation/{ => arch}/x86/x86_64/5level-paging.rst (98%) + rename Documentation/{ => arch}/x86/x86_64/boot-options.rst (98%) + rename Documentation/{ => arch}/x86/x86_64/cpu-hotplug-spec.rst (100%) + rename Documentation/{ => arch}/x86/x86_64/fake-numa-for-cpusets.rst (97%) + rename Documentation/{ => arch}/x86/x86_64/fsgs.rst (100%) + rename Documentation/{ => arch}/x86/x86_64/index.rst (100%) + rename Documentation/{ => arch}/x86/x86_64/machinecheck.rst (100%) + rename Documentation/{ => arch}/x86/x86_64/mm.rst (100%) + rename Documentation/{ => arch}/x86/x86_64/uefi.rst (100%) + rename Documentation/{ => arch}/x86/xstate.rst (100%) + rename Documentation/{ => arch}/x86/zero-page.rst (100%) + rename Documentation/{ => arch}/xtensa/atomctl.rst (100%) + rename Documentation/{ => arch}/xtensa/booting.rst (100%) + rename Documentation/{ => arch}/xtensa/features.rst (100%) + rename Documentation/{ => arch}/xtensa/index.rst (100%) + rename Documentation/{ => arch}/xtensa/mmu.rst (100%) + create mode 100644 Documentation/kernel-hacking/false-sharing.rst + create mode 100644 Documentation/process/contribution-maturity-model.rst + create mode 100644 Documentation/translations/sp_SP/process/deprecated.rst + rename Documentation/translations/zh_CN/{arch.rst => arch/index.rst} (82%) + rename Documentation/translations/zh_CN/{ => arch}/openrisc/index.rst (79%) + rename Documentation/translations/zh_CN/{ => arch}/openrisc/openrisc_port.rst (97%) + rename Documentation/translations/zh_CN/{ => arch}/openrisc/todo.rst (88%) + rename Documentation/translations/zh_CN/{ => arch}/parisc/debugging.rst (94%) + rename Documentation/translations/zh_CN/{ => arch}/parisc/index.rst (79%) + rename Documentation/translations/zh_CN/{ => arch}/parisc/registers.rst (98%) + delete mode 100644 fs/qnx4/README + delete mode 100644 fs/qnx6/README +Merging v4l-dvb/master (eeac8ede17557 Linux 6.3-rc2) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (3228cec23b8b2 media: rkvdec: fix use after free bug in rkvdec_remove) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging drivers/media/i2c/ov5670.c +Removing drivers/media/common/btcx-risc.h +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/media/st,stm32-cec.yaml +Removing Documentation/devicetree/bindings/media/si470x.txt +Removing Documentation/devicetree/bindings/media/samsung-s5k6a3.txt +Removing Documentation/devicetree/bindings/media/samsung-s5k5baf.txt +Removing Documentation/devicetree/bindings/media/samsung-s5c73m3.txt +Removing Documentation/devicetree/bindings/media/samsung-mipi-csis.txt +Removing Documentation/devicetree/bindings/media/samsung-fimc.txt +Removing Documentation/devicetree/bindings/media/meson-ir.txt +Removing Documentation/devicetree/bindings/media/exynos4-fimc-is.txt +Removing Documentation/devicetree/bindings/media/exynos-fimc-lite.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/media/cec.rst | 70 +-- + .../bindings/media/amlogic,meson6-ir.yaml | 47 ++ + .../devicetree/bindings/media/exynos-fimc-lite.txt | 16 - + .../devicetree/bindings/media/exynos4-fimc-is.txt | 50 -- + .../bindings/media/i2c/samsung,s5k5baf.yaml | 101 ++++ + .../bindings/media/i2c/samsung,s5k6a3.yaml | 98 ++++ + .../devicetree/bindings/media/i2c/sony,imx290.yaml | 25 +- + .../devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +- + .../media/mediatek,vcodec-subdev-decoder.yaml | 113 ++-- + .../devicetree/bindings/media/meson-ir.txt | 20 - + .../bindings/media/qcom,msm8916-venus.yaml | 86 +-- + .../bindings/media/qcom,msm8996-venus.yaml | 146 +++-- + .../bindings/media/qcom,sc7180-venus.yaml | 97 ++-- + .../bindings/media/qcom,sc7280-venus.yaml | 132 ++--- + .../bindings/media/qcom,sdm660-venus.yaml | 144 ++--- + .../bindings/media/qcom,sdm845-venus-v2.yaml | 108 ++-- + .../bindings/media/qcom,sdm845-venus.yaml | 104 ++-- + .../bindings/media/qcom,sm8250-venus.yaml | 122 ++--- + .../bindings/media/qcom,venus-common.yaml | 73 +++ + Documentation/devicetree/bindings/media/rc.yaml | 2 + + .../bindings/media/samsung,exynos4210-csis.yaml | 170 ++++++ + .../bindings/media/samsung,exynos4210-fimc.yaml | 152 ++++++ + .../bindings/media/samsung,exynos4212-fimc-is.yaml | 220 ++++++++ + .../media/samsung,exynos4212-fimc-lite.yaml | 63 +++ + .../devicetree/bindings/media/samsung,fimc.yaml | 279 ++++++++++ + .../devicetree/bindings/media/samsung,s5c73m3.yaml | 165 ++++++ + .../devicetree/bindings/media/samsung-fimc.txt | 209 -------- + .../bindings/media/samsung-mipi-csis.txt | 81 --- + .../devicetree/bindings/media/samsung-s5c73m3.txt | 97 ---- + .../devicetree/bindings/media/samsung-s5k5baf.txt | 58 -- + .../devicetree/bindings/media/samsung-s5k6a3.txt | 33 -- + Documentation/devicetree/bindings/media/si470x.txt | 26 - + .../devicetree/bindings/media/silabs,si470x.yaml | 48 ++ + .../devicetree/bindings/media/st,stm32-cec.yaml | 53 -- + .../userspace-api/media/v4l/dev-overlay.rst | 10 +- + .../userspace-api/media/v4l/pixfmt-compressed.rst | 25 + + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 10 + + .../userspace-api/media/v4l/vidioc-g-fbuf.rst | 52 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 44 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 39 +- + MAINTAINERS | 8 + + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 6 + + drivers/media/common/btcx-risc.h | 29 - + drivers/media/common/saa7146/saa7146_fops.c | 26 +- + drivers/media/common/saa7146/saa7146_hlp.c | 296 ---------- + drivers/media/common/saa7146/saa7146_video.c | 326 +---------- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 5 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/imx258.c | 13 +- + drivers/media/i2c/imx290.c | 594 +++++++++++++++++---- + drivers/media/i2c/imx296.c | 11 +- + drivers/media/i2c/imx334.c | 322 ++++++++++- + drivers/media/i2c/max9286.c | 1 + + drivers/media/i2c/ov13b10.c | 75 ++- + drivers/media/i2c/ov2685.c | 78 ++- + drivers/media/i2c/ov5647.c | 56 +- + drivers/media/i2c/ov5670.c | 114 ++-- + drivers/media/i2c/st-vgxy61.c | 23 +- + drivers/media/i2c/tc358746.c | 4 +- + drivers/media/pci/bt8xx/Kconfig | 2 +- + drivers/media/pci/bt8xx/btcx-risc.c | 153 ------ + drivers/media/pci/bt8xx/btcx-risc.h | 9 - + drivers/media/pci/bt8xx/bttv-cards.c | 15 - + drivers/media/pci/bt8xx/bttv-driver.c | 436 +-------------- + drivers/media/pci/bt8xx/bttv-risc.c | 131 ----- + drivers/media/pci/bt8xx/bttvp.h | 28 +- + drivers/media/pci/cx18/Kconfig | 2 +- + drivers/media/pci/cx18/cx18-driver.c | 4 +- + drivers/media/pci/cx18/cx18-driver.h | 24 +- + drivers/media/pci/cx18/cx18-fileops.c | 85 +-- + drivers/media/pci/cx18/cx18-fileops.h | 3 +- + drivers/media/pci/cx18/cx18-ioctl.c | 391 ++++++-------- + drivers/media/pci/cx18/cx18-mailbox.c | 27 +- + drivers/media/pci/cx18/cx18-streams.c | 278 +++++----- + drivers/media/pci/cx23885/cx23885-core.c | 4 +- + drivers/media/pci/cx23885/cx23885-video.c | 13 +- + drivers/media/pci/saa7134/saa7134-cards.c | 1 - + drivers/media/pci/saa7134/saa7134-core.c | 32 -- + drivers/media/pci/saa7134/saa7134-video.c | 411 +------------- + drivers/media/pci/saa7134/saa7134.h | 13 - + drivers/media/pci/ttpci/budget-av.c | 1 + + drivers/media/pci/tw68/tw68-video.c | 16 +- + drivers/media/pci/zoran/zoran_device.h | 2 - + drivers/media/platform/amphion/vdec.c | 53 ++ + drivers/media/platform/amphion/vpu_codec.h | 3 +- + drivers/media/platform/amphion/vpu_malone.c | 45 +- + drivers/media/platform/amphion/vpu_malone.h | 1 + + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 132 +++-- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.h | 28 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 43 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 38 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 8 +- + .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 24 +- + .../mediatek/vcodec/mtk_vcodec_dec_stateful.c | 12 +- + .../mediatek/vcodec/mtk_vcodec_dec_stateless.c | 14 +- + .../mediatek/vcodec/vdec/vdec_h264_req_multi_if.c | 2 +- + .../mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c | 2 +- + .../platform/mediatek/vcodec/vdec_msg_queue.c | 95 +++- + .../platform/mediatek/vcodec/vdec_msg_queue.h | 12 + + drivers/media/platform/nxp/dw100/dw100.c | 4 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 5 + + drivers/media/platform/renesas/rcar-isp.c | 5 +- + .../platform/samsung/exynos4-is/fimc-is-errno.c | 2 +- + .../platform/samsung/exynos4-is/fimc-is-errno.h | 2 +- + .../media/platform/samsung/exynos4-is/media-dev.c | 10 +- + drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c | 2 + + drivers/media/platform/st/stm32/dma2d/dma2d.c | 5 +- + drivers/media/platform/st/stm32/dma2d/dma2d.h | 2 - + drivers/media/platform/st/stm32/stm32-dcmi.c | 1 + + drivers/media/platform/verisilicon/hantro_drv.c | 49 +- + .../media/platform/verisilicon/hantro_postproc.c | 2 +- + drivers/media/platform/verisilicon/hantro_v4l2.c | 90 ++-- + drivers/media/platform/verisilicon/hantro_v4l2.h | 3 +- + drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 2 + + drivers/media/platform/via/via-camera.c | 4 +- + drivers/media/rc/keymaps/Makefile | 2 + + drivers/media/rc/keymaps/rc-beelink-mxiii.c | 57 ++ + drivers/media/rc/keymaps/rc-dreambox.c | 151 ++++++ + drivers/media/test-drivers/vivid/vivid-core.c | 49 +- + drivers/media/test-drivers/vivid/vivid-core.h | 19 - + .../media/test-drivers/vivid/vivid-kthread-cap.c | 131 +---- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 272 ---------- + drivers/media/test-drivers/vivid/vivid-vid-cap.h | 3 - + drivers/media/test-drivers/vivid/vivid-vid-out.c | 74 --- + drivers/media/tuners/mxl5005s.c | 12 +- + drivers/media/usb/dvb-usb/pctv452e.c | 2 + + drivers/media/usb/pvrusb2/Kconfig | 2 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 85 +-- + drivers/media/v4l2-core/v4l2-dev.c | 5 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 80 +-- + drivers/media/v4l2-core/v4l2-subdev.c | 45 +- + drivers/staging/media/av7110/av7110_av.c | 4 +- + drivers/staging/media/av7110/av7110_v4l.c | 17 +- + drivers/staging/media/rkvdec/rkvdec.c | 2 + + drivers/staging/media/sunxi/cedrus/cedrus.c | 1 + + include/media/drv-intf/saa7146_vv.h | 21 - + include/media/dvb_net.h | 6 +- + include/media/rc-map.h | 2 + + include/media/tveeprom.h | 2 +- + include/media/v4l2-ctrls.h | 2 +- + include/media/v4l2-subdev.h | 32 +- + include/uapi/linux/videodev2.h | 5 + + 144 files changed, 4258 insertions(+), 4988 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/amlogic,meson6-ir.yaml + delete mode 100644 Documentation/devicetree/bindings/media/exynos-fimc-lite.txt + delete mode 100644 Documentation/devicetree/bindings/media/exynos4-fimc-is.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/samsung,s5k5baf.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/samsung,s5k6a3.yaml + delete mode 100644 Documentation/devicetree/bindings/media/meson-ir.txt + create mode 100644 Documentation/devicetree/bindings/media/qcom,venus-common.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos4210-csis.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos4210-fimc.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-lite.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,fimc.yaml + create mode 100644 Documentation/devicetree/bindings/media/samsung,s5c73m3.yaml + delete mode 100644 Documentation/devicetree/bindings/media/samsung-fimc.txt + delete mode 100644 Documentation/devicetree/bindings/media/samsung-mipi-csis.txt + delete mode 100644 Documentation/devicetree/bindings/media/samsung-s5c73m3.txt + delete mode 100644 Documentation/devicetree/bindings/media/samsung-s5k5baf.txt + delete mode 100644 Documentation/devicetree/bindings/media/samsung-s5k6a3.txt + delete mode 100644 Documentation/devicetree/bindings/media/si470x.txt + create mode 100644 Documentation/devicetree/bindings/media/silabs,si470x.yaml + delete mode 100644 Documentation/devicetree/bindings/media/st,stm32-cec.yaml + delete mode 100644 drivers/media/common/btcx-risc.h + create mode 100644 drivers/media/rc/keymaps/rc-beelink-mxiii.c + create mode 100644 drivers/media/rc/keymaps/rc-dreambox.c +Merging pm/linux-next (5235219c59f89 Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Auto-merging drivers/hwmon/hwmon.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-acpi-pmprofile | 20 +- + Documentation/admin-guide/kernel-parameters.txt | 40 ++-- + Documentation/admin-guide/pm/amd-pstate.rst | 31 ++- + .../bindings/thermal/mediatek-thermal.txt | 1 + + drivers/acpi/acpi_apd.c | 2 + + drivers/acpi/acpi_processor.c | 42 +++- + drivers/acpi/acpi_video.c | 38 ---- + drivers/acpi/acpica/acapps.h | 2 +- + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acconvert.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 2 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 2 +- + drivers/acpi/acpica/aclocal.h | 5 +- + drivers/acpi/acpica/acmacros.h | 2 +- + drivers/acpi/acpica/acnamesp.h | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 4 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 4 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 24 ++- + drivers/acpi/acpica/dbhistry.c | 2 +- + drivers/acpi/acpica/dbnames.c | 3 + + drivers/acpi/acpica/dsargs.c | 2 +- + drivers/acpi/acpica/dscontrol.c | 2 +- + drivers/acpi/acpica/dsdebug.c | 2 +- + drivers/acpi/acpica/dsfield.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsobject.c | 2 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dspkginit.c | 2 +- + drivers/acpi/acpica/dswexec.c | 2 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/dswload2.c | 2 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 13 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evglock.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evgpeinit.c | 2 +- + drivers/acpi/acpica/evgpeutil.c | 2 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 2 +- + drivers/acpi/acpica/evrgnini.c | 6 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconcat.c | 2 +- + drivers/acpi/acpica/exconfig.c | 2 +- + drivers/acpi/acpica/exconvrt.c | 2 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdebug.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 2 +- + drivers/acpi/acpica/exfldio.c | 2 +- + drivers/acpi/acpica/exmisc.c | 2 +- + drivers/acpi/acpica/exmutex.c | 2 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 2 +- + drivers/acpi/acpica/exoparg2.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 2 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 6 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 2 +- + drivers/acpi/acpica/exserial.c | 2 +- + drivers/acpi/acpica/exstore.c | 2 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 2 +- + drivers/acpi/acpica/extrace.c | 2 +- + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwesleep.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 2 +- + drivers/acpi/acpica/nsarguments.c | 2 +- + drivers/acpi/acpica/nsconvert.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsprepkg.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 4 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psloop.c | 2 +- + drivers/acpi/acpica/psobject.c | 2 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/rsaddr.c | 11 +- + drivers/acpi/acpica/rscalc.c | 51 ++++- + drivers/acpi/acpica/rsdumpinfo.c | 17 ++ + drivers/acpi/acpica/rsinfo.c | 5 + + drivers/acpi/acpica/rslist.c | 12 +- + drivers/acpi/acpica/rsmisc.c | 10 +- + drivers/acpi/acpica/rsserial.c | 49 +++++ + drivers/acpi/acpica/tbdata.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 2 +- + drivers/acpi/acpica/tbutils.c | 7 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utaddress.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utascii.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 2 +- + drivers/acpi/acpica/utcache.c | 2 +- + drivers/acpi/acpica/utcksum.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 2 +- + drivers/acpi/acpica/utdecode.c | 2 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utglobal.c | 2 +- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 2 +- + drivers/acpi/acpica/utpredef.c | 2 +- + drivers/acpi/acpica/utprint.c | 2 +- + drivers/acpi/acpica/utresdecode.c | 11 ++ + drivers/acpi/acpica/utresrc.c | 17 +- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utuuid.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/acpica/utxfinit.c | 2 +- + drivers/acpi/apei/einj.c | 14 +- + drivers/acpi/cppc_acpi.c | 118 +++++++++++- + drivers/acpi/ec.c | 18 +- + drivers/acpi/nfit/core.c | 6 +- + drivers/acpi/processor_pdc.c | 11 ++ + drivers/acpi/property.c | 80 ++++---- + drivers/acpi/resource.c | 7 + + drivers/acpi/sbs.c | 27 ++- + drivers/acpi/sleep.c | 8 +- + drivers/acpi/spcr.c | 13 +- + drivers/acpi/sysfs.c | 17 ++ + drivers/acpi/thermal.c | 25 ++- + drivers/acpi/video_detect.c | 35 ---- + drivers/acpi/viot.c | 5 +- + drivers/acpi/x86/utils.c | 1 + + drivers/ata/ahci_imx.c | 2 +- + drivers/ata/pata_ixp4xx_cf.c | 1 + + drivers/ata/pata_macio.c | 1 + + drivers/base/power/main.c | 12 +- + drivers/char/tpm/tpm_atmel.h | 2 +- + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/acpi-cpufreq.c | 39 ++-- + drivers/cpufreq/amd-pstate.c | 177 ++++++++++++----- + drivers/cpufreq/cpufreq.c | 11 +- + drivers/cpufreq/freq_table.c | 7 +- + drivers/cpufreq/intel_pstate.c | 11 +- + drivers/cpufreq/pcc-cpufreq.c | 34 +++- + drivers/cpufreq/pmac32-cpufreq.c | 6 +- + drivers/cpuidle/cpuidle-psci-domain.c | 2 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 6 +- + drivers/fpga/lattice-sysconfig-spi.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 - + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/pmbus/pmbus_core.c | 2 +- + drivers/hwmon/scmi-hwmon.c | 4 +- + drivers/hwmon/scpi-hwmon.c | 2 +- + drivers/iio/adc/ad7292.c | 1 + + drivers/iio/adc/sun4i-gpadc-iio.c | 2 +- + drivers/input/touchscreen/sun4i-ts.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +- + drivers/platform/x86/acerhdf.c | 19 +- + drivers/power/supply/power_supply_core.c | 2 +- + drivers/regulator/max8973-regulator.c | 2 +- + drivers/staging/iio/resolver/ad2s1210.c | 1 + + drivers/thermal/Makefile | 3 +- + drivers/thermal/amlogic_thermal.c | 4 +- + drivers/thermal/armada_thermal.c | 14 +- + drivers/thermal/broadcom/bcm2711_thermal.c | 3 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 3 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 8 +- + drivers/thermal/broadcom/ns-thermal.c | 2 +- + drivers/thermal/broadcom/sr-thermal.c | 2 +- + drivers/thermal/cpufreq_cooling.c | 4 +- + drivers/thermal/da9062-thermal.c | 13 +- + drivers/thermal/db8500_thermal.c | 9 +- + drivers/thermal/devfreq_cooling.c | 2 +- + drivers/thermal/dove_thermal.c | 7 +- + drivers/thermal/gov_fair_share.c | 2 +- + drivers/thermal/gov_power_allocator.c | 2 +- + drivers/thermal/gov_step_wise.c | 2 +- + drivers/thermal/hisi_thermal.c | 9 +- + drivers/thermal/imx8mm_thermal.c | 6 +- + drivers/thermal/imx_sc_thermal.c | 9 +- + drivers/thermal/imx_thermal.c | 70 ++----- + .../intel/int340x_thermal/int3400_thermal.c | 2 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 4 +- + .../int340x_thermal/processor_thermal_device_pci.c | 4 +- + drivers/thermal/intel/intel_pch_thermal.c | 2 +- + drivers/thermal/intel/intel_quark_dts_thermal.c | 6 +- + drivers/thermal/intel/intel_soc_dts_iosf.c | 13 +- + drivers/thermal/intel/therm_throt.c | 73 ++++++- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 12 +- + drivers/thermal/k3_bandgap.c | 4 +- + drivers/thermal/k3_j72xx_bandgap.c | 2 +- + drivers/thermal/kirkwood_thermal.c | 7 +- + drivers/thermal/max77620_thermal.c | 6 +- + drivers/thermal/mediatek/auxadc_thermal.c | 111 +++++++++-- + drivers/thermal/mediatek/lvts_thermal.c | 10 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 6 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 6 +- + drivers/thermal/qcom/tsens.c | 6 +- + drivers/thermal/qoriq_thermal.c | 4 +- + drivers/thermal/rcar_gen3_thermal.c | 57 +----- + drivers/thermal/rcar_thermal.c | 8 +- + drivers/thermal/rockchip_thermal.c | 8 +- + drivers/thermal/rzg2l_thermal.c | 3 +- + drivers/thermal/samsung/exynos_tmu.c | 4 +- + drivers/thermal/spear_thermal.c | 10 +- + drivers/thermal/sprd_thermal.c | 2 +- + drivers/thermal/st/st_thermal.c | 5 +- + drivers/thermal/st/stm_thermal.c | 5 +- + drivers/thermal/sun8i_thermal.c | 4 +- + drivers/thermal/tegra/soctherm.c | 6 +- + drivers/thermal/tegra/tegra-bpmp-thermal.c | 6 +- + drivers/thermal/tegra/tegra30-tsensor.c | 31 +-- + drivers/thermal/thermal-generic-adc.c | 7 +- + drivers/thermal/thermal_core.c | 28 ++- + drivers/thermal/thermal_helpers.c | 6 +- + drivers/thermal/thermal_hwmon.c | 5 +- + drivers/thermal/thermal_hwmon.h | 4 +- + drivers/thermal/thermal_mmio.c | 2 +- + .../thermal.h => drivers/thermal/thermal_trace.h | 6 + + .../thermal/thermal_trace_ipa.h | 6 + + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 20 +- + drivers/thermal/uniphier_thermal.c | 2 +- + drivers/tty/serial/8250/8250_tegra.c | 1 + + drivers/virtio/virtio_mmio.c | 1 + + drivers/xen/pcpu.c | 20 ++ + include/acpi/acbuffer.h | 2 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acexcep.h | 2 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpi_bus.h | 3 +- + include/acpi/acpiosxf.h | 2 +- + include/acpi/acpixf.h | 4 +- + include/acpi/acrestyp.h | 39 +++- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 59 +++++- + include/acpi/actbl2.h | 211 +++++++++++++++++++-- + include/acpi/actbl3.h | 2 +- + include/acpi/actypes.h | 8 +- + include/acpi/acuuid.h | 2 +- + include/acpi/cppc_acpi.h | 11 ++ + include/acpi/platform/acenv.h | 4 +- + include/acpi/platform/acenvex.h | 2 +- + include/acpi/platform/acgcc.h | 13 +- + include/acpi/platform/acgccex.h | 2 +- + include/acpi/platform/aclinux.h | 7 +- + include/acpi/platform/aclinuxex.h | 2 +- + include/acpi/platform/aczephyr.h | 48 +++++ + include/acpi/video.h | 2 - + include/linux/acpi.h | 6 +- + include/linux/amd-pstate.h | 2 + + include/linux/cpufreq.h | 1 + + include/linux/thermal.h | 19 ++ + include/xen/xen.h | 11 ++ + net/rfkill/rfkill-gpio.c | 1 + + tools/power/acpi/common/cmfsize.c | 2 +- + tools/power/acpi/common/getopt.c | 2 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 2 +- + .../acpi/os_specific/service_layers/osunixdir.c | 2 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 2 +- + tools/power/acpi/tools/acpidump/acpidump.h | 2 +- + tools/power/acpi/tools/acpidump/apdump.c | 2 +- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + tools/power/pm-graph/README | 2 +- + tools/power/pm-graph/install_latest_from_github.sh | 38 ++++ + tools/power/pm-graph/sleepgraph.py | 58 ++++-- + tools/testing/nvdimm/test/nfit.c | 4 +- + 315 files changed, 1846 insertions(+), 927 deletions(-) + rename include/trace/events/thermal.h => drivers/thermal/thermal_trace.h (97%) + rename include/trace/events/thermal_power_allocator.h => drivers/thermal/thermal_trace_ipa.h (96%) + create mode 100644 include/acpi/platform/aczephyr.h + create mode 100755 tools/power/pm-graph/install_latest_from_github.sh +Merging cpufreq-arm/cpufreq/arm/linux-next (e2b47e585931a cpufreq: qcom-cpufreq-hw: Revert adding cpufreq qos) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Auto-merging drivers/cpufreq/freq_table.c +Merge made by the 'recursive' strategy. + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 119 ++++++++++++++++++++- + drivers/cpufreq/cpufreq-dt-platdev.c | 3 +- + drivers/cpufreq/freq_table.c | 1 - + drivers/cpufreq/imx-cpufreq-dt.c | 2 +- + drivers/cpufreq/imx6q-cpufreq.c | 4 +- + drivers/cpufreq/mediatek-cpufreq.c | 98 ++++++++++------- + drivers/cpufreq/qcom-cpufreq-hw.c | 54 ++-------- + drivers/cpufreq/scmi-cpufreq.c | 2 +- + drivers/cpufreq/tegra124-cpufreq.c | 1 - + drivers/cpufreq/tegra20-cpufreq.c | 2 +- + 10 files changed, 188 insertions(+), 98 deletions(-) +Merging cpupower/cpupower (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (376b1446153ca PM / devfreq: exynos-ppmu: Use devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'recursive' strategy. + drivers/devfreq/Kconfig | 1 - + drivers/devfreq/event/exynos-ppmu.c | 3 +-- + drivers/devfreq/exynos-bus.c | 4 ++-- + 3 files changed, 3 insertions(+), 5 deletions(-) +Merging opp/opp/linux-next (528f2d8d540a3 OPP: Move required opps configuration to specialized callback) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 78 ++++++++++++++++++++++++++++++------------------------ + drivers/opp/of.c | 7 +++-- + drivers/opp/opp.h | 4 +++ + 3 files changed, 53 insertions(+), 36 deletions(-) +Merging thermal/thermal/linux-next (0c7d069297a09 Merge back thermal control material for 6.4-rc1.) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging dlm/next (1361737f102d8 fs: dlm: switch lkb_sbflags to atomic ops) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Removing include/uapi/linux/dlm_netlink.h +Removing fs/dlm/netlink.c +Merge made by the 'recursive' strategy. + fs/dlm/Kconfig | 9 - + fs/dlm/Makefile | 1 - + fs/dlm/ast.c | 11 +- + fs/dlm/config.c | 21 -- + fs/dlm/config.h | 3 - + fs/dlm/debug_fs.c | 8 +- + fs/dlm/dlm_internal.h | 154 +++++++---- + fs/dlm/lock.c | 531 ++++++++++++-------------------------- + fs/dlm/lock.h | 17 -- + fs/dlm/lockspace.c | 29 +-- + fs/dlm/lowcomms.c | 6 +- + fs/dlm/main.c | 9 +- + fs/dlm/memory.c | 2 +- + fs/dlm/netlink.c | 139 ---------- + fs/dlm/rcom.c | 2 +- + fs/dlm/recover.c | 2 +- + fs/dlm/recoverd.c | 2 - + fs/dlm/user.c | 34 +-- + include/linux/dlm.h | 3 - + include/trace/events/dlm.h | 12 +- + include/uapi/linux/dlm.h | 1 + + include/uapi/linux/dlm_netlink.h | 60 ----- + include/uapi/linux/dlmconstants.h | 5 +- + 23 files changed, 298 insertions(+), 763 deletions(-) + delete mode 100644 fs/dlm/netlink.c + delete mode 100644 include/uapi/linux/dlm_netlink.h +Merging rdma/for-next (a2e20b29cf9ce RDMA/irdma: Slightly optimize irdma_form_ah_cm_frame()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/hw/irdma/utils.c +Auto-merging drivers/infiniband/hw/irdma/hw.c +Auto-merging drivers/infiniband/hw/irdma/cm.c +Auto-merging drivers/infiniband/hw/erdma/erdma_main.c +Auto-merging drivers/infiniband/hw/erdma/erdma_hw.h +Auto-merging drivers/infiniband/hw/erdma/erdma_cq.c +Auto-merging drivers/infiniband/core/cma.c +Merge made by the 'recursive' strategy. + drivers/infiniband/core/cm.c | 3 +- + drivers/infiniband/core/cma.c | 6 +- + drivers/infiniband/core/user_mad.c | 23 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 109 + + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 + + drivers/infiniband/hw/bnxt_re/main.c | 103 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 211 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 5 + + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 97 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 66 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 337 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 68 +- + drivers/infiniband/hw/bnxt_re/qplib_tlv.h | 162 + + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 7423 +++++++++++++---------- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 7 +- + drivers/infiniband/hw/efa/efa_verbs.c | 5 +- + drivers/infiniband/hw/erdma/erdma.h | 2 +- + drivers/infiniband/hw/erdma/erdma_cm.h | 10 +- + drivers/infiniband/hw/erdma/erdma_cmdq.c | 42 +- + drivers/infiniband/hw/erdma/erdma_cq.c | 2 +- + drivers/infiniband/hw/erdma/erdma_eq.c | 9 +- + drivers/infiniband/hw/erdma/erdma_hw.h | 4 + + drivers/infiniband/hw/erdma/erdma_main.c | 39 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 17 +- + drivers/infiniband/hw/hfi1/chip.c | 18 +- + drivers/infiniband/hw/hfi1/driver.c | 2 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/init.c | 12 +- + drivers/infiniband/hw/hfi1/ipoib_tx.c | 6 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 84 +- + drivers/infiniband/hw/hfi1/mmu_rb.h | 22 +- + drivers/infiniband/hw/hfi1/pcie.c | 2 - + drivers/infiniband/hw/hfi1/pio.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 21 +- + drivers/infiniband/hw/hfi1/sdma.h | 16 +- + drivers/infiniband/hw/hfi1/sdma_txreq.h | 1 + + drivers/infiniband/hw/hfi1/trace_dbg.h | 7 + + drivers/infiniband/hw/hfi1/trace_mmu.h | 4 - + drivers/infiniband/hw/hfi1/user_sdma.c | 600 +- + drivers/infiniband/hw/hfi1/user_sdma.h | 5 - + drivers/infiniband/hw/hfi1/verbs.c | 4 +- + drivers/infiniband/hw/hfi1/vnic_sdma.c | 1 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 189 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 31 +- + drivers/infiniband/hw/irdma/cm.c | 2 +- + drivers/infiniband/hw/irdma/ctrl.c | 324 +- + drivers/infiniband/hw/irdma/defs.h | 9 +- + drivers/infiniband/hw/irdma/hw.c | 13 +- + drivers/infiniband/hw/irdma/i40iw_hw.c | 60 +- + drivers/infiniband/hw/irdma/icrdma_hw.c | 51 + + drivers/infiniband/hw/irdma/irdma.h | 1 + + drivers/infiniband/hw/irdma/main.h | 3 + + drivers/infiniband/hw/irdma/pble.c | 16 +- + drivers/infiniband/hw/irdma/pble.h | 2 +- + drivers/infiniband/hw/irdma/protos.h | 8 +- + drivers/infiniband/hw/irdma/type.h | 166 +- + drivers/infiniband/hw/irdma/utils.c | 172 +- + drivers/infiniband/hw/irdma/verbs.c | 200 +- + drivers/infiniband/hw/mlx4/qp.c | 8 +- + drivers/infiniband/hw/mlx5/counters.c | 171 +- + drivers/infiniband/hw/mlx5/devx.c | 2 - + drivers/infiniband/hw/mlx5/qp.c | 17 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 - + drivers/infiniband/hw/qib/qib_file_ops.c | 9 +- + drivers/infiniband/hw/qib/qib_pcie.c | 8 - + drivers/infiniband/hw/qib/qib_user_sdma.c | 11 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 - + drivers/infiniband/sw/rdmavt/qp.c | 4 +- + drivers/infiniband/sw/rxe/rxe.c | 16 +- + drivers/infiniband/sw/rxe/rxe.h | 46 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 75 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 39 +- + drivers/infiniband/sw/rxe/rxe_icrc.c | 4 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 7 +- + drivers/infiniband/sw/rxe/rxe_mmap.c | 6 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 13 - + drivers/infiniband/sw/rxe/rxe_net.c | 4 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 72 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 5 +- + drivers/infiniband/sw/rxe/rxe_req.c | 12 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 118 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 6 +- + drivers/infiniband/sw/rxe/rxe_task.c | 268 +- + drivers/infiniband/sw/rxe/rxe_task.h | 23 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 841 ++- + drivers/infiniband/sw/rxe/rxe_verbs.h | 2 - + drivers/infiniband/sw/siw/siw_main.c | 3 - + drivers/infiniband/sw/siw/siw_qp_tx.c | 2 +- + drivers/infiniband/ulp/iser/iser_initiator.c | 17 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 6 - + drivers/infiniband/ulp/srpt/ib_srpt.c | 23 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 81 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 + + include/linux/mlx5/mlx5_ifc.h | 23 +- + include/uapi/rdma/bnxt_re-abi.h | 4 + + include/uapi/rdma/efa-abi.h | 3 +- + 96 files changed, 7554 insertions(+), 5211 deletions(-) + create mode 100644 drivers/infiniband/hw/bnxt_re/qplib_tlv.h +Merging net-next/main (c11d2e718c792 Merge branch 'msg_control-split') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Removing tools/testing/selftests/bpf/verifier/xdp_direct_packet_access.c +Removing tools/testing/selftests/bpf/verifier/xdp.c +Removing tools/testing/selftests/bpf/verifier/xadd.c +Removing tools/testing/selftests/bpf/verifier/var_off.c +Removing tools/testing/selftests/bpf/verifier/value_or_null.c +Removing tools/testing/selftests/bpf/verifier/value_adj_spill.c +Removing tools/testing/selftests/bpf/verifier/value.c +Removing tools/testing/selftests/bpf/verifier/uninit.c +Removing tools/testing/selftests/bpf/verifier/stack_ptr.c +Removing tools/testing/selftests/bpf/verifier/spill_fill.c +Removing tools/testing/selftests/bpf/verifier/ringbuf.c +Removing tools/testing/selftests/bpf/verifier/raw_tp_writable.c +Removing tools/testing/selftests/bpf/verifier/raw_stack.c +Removing tools/testing/selftests/bpf/verifier/meta_access.c +Removing tools/testing/selftests/bpf/verifier/masking.c +Removing tools/testing/selftests/bpf/verifier/map_ret_val.c +Removing tools/testing/selftests/bpf/verifier/map_ptr.c +Removing tools/testing/selftests/bpf/verifier/leak_ptr.c +Removing tools/testing/selftests/bpf/verifier/ld_ind.c +Removing tools/testing/selftests/bpf/verifier/int_ptr.c +Removing tools/testing/selftests/bpf/verifier/helper_value_access.c +Removing tools/testing/selftests/bpf/verifier/helper_restricted.c +Removing tools/testing/selftests/bpf/verifier/helper_packet_access.c +Removing tools/testing/selftests/bpf/verifier/helper_access_var_len.c +Removing tools/testing/selftests/bpf/verifier/div_overflow.c +Removing tools/testing/selftests/bpf/verifier/div0.c +Removing tools/testing/selftests/bpf/verifier/direct_stack_access_wraparound.c +Removing tools/testing/selftests/bpf/verifier/ctx_sk_msg.c +Removing tools/testing/selftests/bpf/verifier/const_or.c +Removing tools/testing/selftests/bpf/verifier/cgroup_storage.c +Removing tools/testing/selftests/bpf/verifier/cgroup_skb.c +Removing tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c +Removing tools/testing/selftests/bpf/verifier/cfg.c +Removing tools/testing/selftests/bpf/verifier/bounds_mix_sign_unsign.c +Removing tools/testing/selftests/bpf/verifier/bounds_deduction.c +Removing tools/testing/selftests/bpf/verifier/basic_stack.c +Removing tools/testing/selftests/bpf/verifier/array_access.c +Removing tools/testing/selftests/bpf/verifier/and.c +Removing tools/testing/selftests/bpf/test_verifier_log.c +Auto-merging tools/lib/bpf/usdt.c +Auto-merging tools/lib/bpf/libbpf.c +Removing tools/arch/s390/include/uapi/asm/ptrace.h +Removing tools/arch/s390/include/uapi/asm/bpf_perf_event.h +Removing tools/arch/arm64/include/uapi/asm/bpf_perf_event.h +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/bpf/trampoline.c +Auto-merging kernel/bpf/bpf_inode_storage.c +Auto-merging include/linux/sched.h +Removing include/linux/platform_data/nfcmrvl.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging fs/dlm/lowcomms.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tt.c +Auto-merging drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Removing drivers/net/ethernet/mediatek/mtk_sgmii.c +Removing drivers/net/ethernet/intel/ixgb/ixgb_param.c +Removing drivers/net/ethernet/intel/ixgb/ixgb_osdep.h +Removing drivers/net/ethernet/intel/ixgb/ixgb_main.c +Removing drivers/net/ethernet/intel/ixgb/ixgb_ids.h +Removing drivers/net/ethernet/intel/ixgb/ixgb_hw.h +Removing drivers/net/ethernet/intel/ixgb/ixgb_hw.c +Removing drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c +Removing drivers/net/ethernet/intel/ixgb/ixgb_ee.h +Removing drivers/net/ethernet/intel/ixgb/ixgb_ee.c +Removing drivers/net/ethernet/intel/ixgb/ixgb.h +Removing drivers/net/ethernet/intel/ixgb/Makefile +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/networking/device_drivers/ethernet/intel/ixgb.rst +Auto-merging Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml +Removing Documentation/devicetree/bindings/net/qcom,ethqos.txt +Removing Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt +Resolved 'drivers/net/ethernet/mellanox/mlxsw/core_thermal.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f0636d2c5bd2f] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/pci-error-recovery.rst | 1 - + Documentation/bpf/bpf_design_QA.rst | 4 +- + Documentation/bpf/bpf_devel_QA.rst | 20 +- + Documentation/bpf/clang-notes.rst | 6 + + Documentation/bpf/cpumasks.rst | 34 +- + Documentation/bpf/instruction-set.rst | 169 +- + Documentation/bpf/kfuncs.rst | 161 +- + Documentation/bpf/libbpf/index.rst | 25 +- + Documentation/bpf/libbpf/libbpf_overview.rst | 228 ++ + Documentation/bpf/linux-notes.rst | 30 + + Documentation/bpf/maps.rst | 7 +- + .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 27 - + .../bindings/arm/stm32/st,stm32-syscon.yaml | 2 + + .../devicetree/bindings/net/actions,owl-emac.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-emac.yaml | 2 +- + .../bindings/net/allwinner,sun4i-a10-mdio.yaml | 2 +- + .../devicetree/bindings/net/altr,tse.yaml | 2 +- + .../bindings/net/amlogic,meson-dwmac.yaml | 4 +- + .../bindings/net/aspeed,ast2600-mdio.yaml | 2 +- + .../devicetree/bindings/net/brcm,amac.yaml | 2 +- + .../devicetree/bindings/net/brcm,systemport.yaml | 2 +- + .../bindings/net/broadcom-bluetooth.yaml | 2 +- + .../devicetree/bindings/net/can/fsl,flexcan.yaml | 3 + + .../bindings/net/can/st,stm32-bxcan.yaml | 85 + + .../devicetree/bindings/net/can/xilinx,can.yaml | 6 +- + .../devicetree/bindings/net/dsa/brcm,b53.yaml | 4 + + .../devicetree/bindings/net/dsa/brcm,sf2.yaml | 12 +- + .../bindings/net/dsa/mediatek,mt7530.yaml | 32 +- + .../devicetree/bindings/net/dsa/qca8k.yaml | 2 +- + .../devicetree/bindings/net/engleder,tsnep.yaml | 2 +- + .../devicetree/bindings/net/ethernet-phy.yaml | 2 +- + .../devicetree/bindings/net/ethernet-switch.yaml | 4 + + Documentation/devicetree/bindings/net/fsl,fec.yaml | 3 + + .../bindings/net/fsl,qoriq-mc-dpmac.yaml | 2 +- + .../bindings/net/intel,ixp46x-ptp-timer.yaml | 4 +- + .../bindings/net/intel,ixp4xx-ethernet.yaml | 12 +- + .../devicetree/bindings/net/intel,ixp4xx-hss.yaml | 18 +- + .../devicetree/bindings/net/marvell,mvusb.yaml | 2 +- + .../devicetree/bindings/net/marvell-bluetooth.yaml | 4 +- + .../devicetree/bindings/net/mdio-gpio.yaml | 2 +- + .../devicetree/bindings/net/mediatek,net.yaml | 55 +- + .../bindings/net/mediatek,star-emac.yaml | 2 +- + .../bindings/net/microchip,lan966x-switch.yaml | 2 +- + .../bindings/net/microchip,sparx5-switch.yaml | 4 +- + .../devicetree/bindings/net/mscc,miim.yaml | 2 +- + .../devicetree/bindings/net/nfc/marvell,nci.yaml | 2 +- + .../devicetree/bindings/net/nfc/nxp,pn532.yaml | 2 +- + .../bindings/net/pcs/mediatek,sgmiisys.yaml | 55 + + .../bindings/net/pse-pd/podl-pse-regulator.yaml | 2 +- + .../devicetree/bindings/net/qcom,ethqos.txt | 66 - + .../devicetree/bindings/net/qcom,ethqos.yaml | 111 + + .../devicetree/bindings/net/qcom,ipa.yaml | 1 + + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 2 +- + .../devicetree/bindings/net/qcom,ipq8064-mdio.yaml | 6 +- + .../devicetree/bindings/net/rockchip,emac.yaml | 2 +- + .../devicetree/bindings/net/rockchip-dwmac.yaml | 4 +- + Documentation/devicetree/bindings/net/sff,sfp.yaml | 4 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 11 +- + .../devicetree/bindings/net/stm32-dwmac.yaml | 8 +- + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 10 +- + .../devicetree/bindings/net/ti,davinci-mdio.yaml | 2 +- + .../devicetree/bindings/net/ti,dp83822.yaml | 6 +- + .../devicetree/bindings/net/ti,dp83867.yaml | 6 +- + .../devicetree/bindings/net/ti,dp83869.yaml | 6 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 24 +- + .../bindings/net/toshiba,visconti-dwmac.yaml | 4 +- + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 4 +- + Documentation/netlink/genetlink-c.yaml | 2 +- + Documentation/netlink/genetlink-legacy.yaml | 18 +- + Documentation/netlink/genetlink.yaml | 3 + + Documentation/netlink/specs/devlink.yaml | 198 ++ + Documentation/netlink/specs/ethtool.yaml | 1484 ++++++++++++- + Documentation/netlink/specs/ovs_datapath.yaml | 153 ++ + Documentation/netlink/specs/ovs_vport.yaml | 139 ++ + .../device_drivers/can/ctu/ctucanfd-driver.rst | 3 +- + .../networking/device_drivers/ethernet/index.rst | 1 - + .../device_drivers/ethernet/intel/e100.rst | 7 +- + .../device_drivers/ethernet/intel/e1000.rst | 9 +- + .../device_drivers/ethernet/intel/e1000e.rst | 7 +- + .../device_drivers/ethernet/intel/fm10k.rst | 7 +- + .../device_drivers/ethernet/intel/i40e.rst | 11 +- + .../device_drivers/ethernet/intel/iavf.rst | 7 +- + .../device_drivers/ethernet/intel/ice.rst | 9 +- + .../device_drivers/ethernet/intel/igb.rst | 7 +- + .../device_drivers/ethernet/intel/igbvf.rst | 7 +- + .../device_drivers/ethernet/intel/ixgb.rst | 468 ---- + .../device_drivers/ethernet/intel/ixgbe.rst | 7 +- + .../device_drivers/ethernet/intel/ixgbevf.rst | 7 +- + .../ethernet/mellanox/mlx5/counters.rst | 26 - + .../ethernet/mellanox/mlx5/devlink.rst | 35 + + Documentation/networking/devlink/mlx5.rst | 12 + + Documentation/networking/driver.rst | 156 +- + Documentation/networking/ethtool-netlink.rst | 47 +- + Documentation/networking/index.rst | 1 + + Documentation/networking/napi.rst | 254 +++ + Documentation/process/maintainer-netdev.rst | 38 +- + .../userspace-api/netlink/genetlink-legacy.rst | 88 +- + Documentation/userspace-api/netlink/specs.rst | 10 + + MAINTAINERS | 36 +- + arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 + + arch/arm/boot/dts/stm32f429.dtsi | 29 + + arch/loongarch/configs/loongson3_defconfig | 1 - + arch/loongarch/net/bpf_jit.c | 6 + + arch/mips/Kconfig | 5 +- + arch/mips/configs/loongson2k_defconfig | 1 - + arch/mips/configs/loongson3_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/net/bpf_jit_comp.c | 4 + + arch/mips/net/bpf_jit_comp64.c | 3 + + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc64e_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/riscv/net/bpf_jit_comp64.c | 5 + + drivers/bcma/driver_mips.c | 6 - + drivers/bcma/main.c | 10 +- + drivers/hid/bpf/hid_bpf_dispatch.c | 3 - + drivers/isdn/hardware/mISDN/hfcmulti.c | 31 - + drivers/isdn/hardware/mISDN/netjet.c | 1 - + drivers/mfd/ocelot-core.c | 13 + + drivers/net/can/Kconfig | 12 + + drivers/net/can/Makefile | 1 + + drivers/net/can/bxcan.c | 1098 ++++++++++ + drivers/net/can/c_can/c_can_pci.c | 2 - + drivers/net/can/ctucanfd/ctucanfd_pci.c | 8 +- + drivers/net/can/kvaser_pciefd.c | 1 - + drivers/net/can/m_can/m_can.c | 37 +- + drivers/net/can/rcar/rcar_canfd.c | 71 +- + drivers/net/can/usb/esd_usb.c | 195 +- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 102 +- + drivers/net/dsa/Kconfig | 26 +- + drivers/net/dsa/Makefile | 2 + + drivers/net/dsa/b53/b53_common.c | 78 + + drivers/net/dsa/b53/b53_mdio.c | 5 +- + drivers/net/dsa/b53/b53_mmap.c | 29 +- + drivers/net/dsa/b53/b53_priv.h | 17 +- + drivers/net/dsa/b53/b53_regs.h | 1 + + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 45 +- + drivers/net/dsa/lan9303_i2c.c | 2 +- + drivers/net/dsa/lan9303_mdio.c | 2 +- + drivers/net/dsa/lantiq_gswip.c | 2 +- + drivers/net/dsa/microchip/ksz8.h | 8 +- + drivers/net/dsa/microchip/ksz8795.c | 179 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 2 +- + drivers/net/dsa/microchip/ksz_common.c | 240 +- + drivers/net/dsa/microchip/ksz_common.h | 18 +- + drivers/net/dsa/mt7530-mdio.c | 271 +++ + drivers/net/dsa/mt7530-mmio.c | 101 + + drivers/net/dsa/mt7530.c | 714 +++--- + drivers/net/dsa/mt7530.h | 85 +- + drivers/net/dsa/mv88e6xxx/chip.c | 387 ++-- + drivers/net/dsa/mv88e6xxx/global2.c | 20 +- + drivers/net/dsa/ocelot/felix.c | 24 +- + drivers/net/dsa/ocelot/felix.h | 7 + + drivers/net/dsa/ocelot/ocelot_ext.c | 18 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 2 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 1 - + drivers/net/dsa/realtek/rtl8365mb.c | 40 +- + drivers/net/ethernet/8390/axnet_cs.c | 3 - + drivers/net/ethernet/Kconfig | 2 +- + drivers/net/ethernet/alteon/acenic.c | 3 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 4 + + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 66 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 261 ++- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 15 +- + .../net/ethernet/aquantia/atlantic/aq_drvinfo.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 4 - + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 10 - + drivers/net/ethernet/broadcom/bnx2.c | 52 +- + drivers/net/ethernet/broadcom/bnx2.h | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 19 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 56 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 66 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 14 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 16 + + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 29 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h | 6 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 6 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 6 +- + drivers/net/ethernet/cadence/macb.h | 8 +- + drivers/net/ethernet/cadence/macb_main.c | 41 +- + drivers/net/ethernet/cadence/macb_ptp.c | 4 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 1 - + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 1 - + .../net/ethernet/cavium/liquidio/request_manager.c | 9 - + drivers/net/ethernet/chelsio/cxgb3/sge.c | 5 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 - + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 - + drivers/net/ethernet/ec_bhf.c | 2 - + drivers/net/ethernet/emulex/benet/be_cmds.c | 27 +- + drivers/net/ethernet/emulex/benet/be_main.c | 8 - + drivers/net/ethernet/engleder/tsnep_main.c | 1 - + drivers/net/ethernet/freescale/Kconfig | 1 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 3 +- + drivers/net/ethernet/freescale/enetc/Kconfig | 1 + + drivers/net/ethernet/freescale/enetc/enetc.c | 31 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 1 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 4 + + drivers/net/ethernet/fungible/funcore/fun_dev.c | 7 - + drivers/net/ethernet/google/gve/gve.h | 110 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 8 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 4 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 91 +- + drivers/net/ethernet/google/gve/gve_main.c | 719 +++++- + drivers/net/ethernet/google/gve/gve_rx.c | 147 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 2 +- + drivers/net/ethernet/google/gve/gve_tx.c | 298 ++- + drivers/net/ethernet/google/gve/gve_utils.c | 6 +- + drivers/net/ethernet/google/gve/gve_utils.h | 3 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 12 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 1 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 - + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 27 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 12 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 137 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 8 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +- + drivers/net/ethernet/intel/Kconfig | 17 - + drivers/net/ethernet/intel/Makefile | 1 - + drivers/net/ethernet/intel/e1000e/netdev.c | 1 - + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 - + drivers/net/ethernet/intel/i40e/i40e.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 7 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 88 +- + drivers/net/ethernet/intel/i40e/i40e_trace.h | 20 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 420 ++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 20 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 74 +- + drivers/net/ethernet/intel/iavf/iavf.h | 1 - + drivers/net/ethernet/intel/ice/ice.h | 1 - + drivers/net/ethernet/intel/ice/ice_devlink.c | 1 - + drivers/net/ethernet/intel/ice/ice_main.c | 12 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 77 +- + drivers/net/ethernet/intel/ice/ice_sriov.h | 15 - + drivers/net/ethernet/intel/ice/ice_type.h | 17 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 15 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 2 +- + drivers/net/ethernet/intel/ice/ice_vf_mbx.c | 249 +-- + drivers/net/ethernet/intel/ice/ice_vf_mbx.h | 17 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 49 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.h | 8 + + drivers/net/ethernet/intel/igb/igb_main.c | 1 - + drivers/net/ethernet/intel/igb/igb_ptp.c | 11 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 29 + + drivers/net/ethernet/intel/igc/igc.h | 4 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 3 - + drivers/net/ethernet/intel/igc/igc_ethtool.c | 1 + + drivers/net/ethernet/intel/igc/igc_hw.h | 1 + + drivers/net/ethernet/intel/igc/igc_i225.c | 19 +- + drivers/net/ethernet/intel/igc/igc_main.c | 52 +- + drivers/net/ethernet/intel/igc/igc_regs.h | 1 - + drivers/net/ethernet/intel/igc/igc_tsn.c | 12 + + drivers/net/ethernet/intel/ixgb/Makefile | 9 - + drivers/net/ethernet/intel/ixgb/ixgb.h | 179 -- + drivers/net/ethernet/intel/ixgb/ixgb_ee.c | 580 ----- + drivers/net/ethernet/intel/ixgb/ixgb_ee.h | 79 - + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 642 ------ + drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 1229 ----------- + drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 767 ------- + drivers/net/ethernet/intel/ixgb/ixgb_ids.h | 23 - + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2285 ------------------- + drivers/net/ethernet/intel/ixgb/ixgb_osdep.h | 39 - + drivers/net/ethernet/intel/ixgb/ixgb_param.c | 442 ---- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 42 +- + drivers/net/ethernet/marvell/Kconfig | 1 + + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 24 +- + .../net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 72 +- + .../net/ethernet/marvell/octeon_ep/octep_config.h | 6 + + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 276 +-- + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.h | 88 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.c | 387 ++-- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.h | 196 +- + .../net/ethernet/marvell/octeon_ep/octep_ethtool.c | 12 +- + .../net/ethernet/marvell/octeon_ep/octep_main.c | 184 +- + .../net/ethernet/marvell/octeon_ep/octep_main.h | 18 +- + .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 6 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 4 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/mediatek/Kconfig | 2 + + drivers/net/ethernet/mediatek/Makefile | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_path.c | 14 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 192 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 121 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 129 +- + drivers/net/ethernet/mediatek/mtk_ppe.h | 25 +- + drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c | 11 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 48 +- + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 14 + + drivers/net/ethernet/mediatek/mtk_sgmii.c | 207 -- + drivers/net/ethernet/mediatek/mtk_wed.c | 101 + + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 71 + + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 13 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 68 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 55 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 157 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 14 - + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 22 +- + .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 16 + + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 63 +- + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 46 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 38 + + .../ethernet/mellanox/mlx5/core/en/tc/act/accept.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/act.c | 20 - + .../ethernet/mellanox/mlx5/core/en/tc/act/act.h | 8 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c | 66 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/drop.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/mirred.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/pedit.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/ptype.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/sample.c | 20 - + .../ethernet/mellanox/mlx5/core/en/tc/act/trap.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/tun.c | 10 - + .../ethernet/mellanox/mlx5/core/en/tc/act/vlan.c | 10 - + .../mellanox/mlx5/core/en/tc/act/vlan_mangle.c | 10 - + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 169 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 31 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 11 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 3 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 37 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 24 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 72 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 54 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 10 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 402 +++- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 60 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 555 ++++- + .../mellanox/mlx5/core/en_accel/ipsec_offload.c | 230 +- + .../mellanox/mlx5/core/en_accel/macsec_fs.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 175 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 452 ++-- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 20 - + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 10 - + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 357 +-- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 220 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 287 ++- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.h | 17 + + .../ethernet/mellanox/mlx5/core/esw/bridge_mcast.c | 1126 ++++++++++ + .../ethernet/mellanox/mlx5/core/esw/bridge_priv.h | 181 ++ + .../mlx5/core/esw/diag/bridge_tracepoint.h | 35 + + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 2 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 4 + + .../net/ethernet/mellanox/mlx5/core/irq_affinity.c | 42 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 2 +- + .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 89 +- + .../ethernet/mellanox/mlx5/core/lib/fs_chains.h | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 36 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 248 ++- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 151 ++ + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 2 +- + .../ethernet/mellanox/mlx5/core/steering/dr_cmd.c | 6 + + .../mellanox/mlx5/core/steering/dr_domain.c | 45 +- + .../mellanox/mlx5/core/steering/dr_icm_pool.c | 41 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ptrn.c | 43 + + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 60 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 7 +- + .../mellanox/mlx5/core/steering/dr_types.h | 11 + + drivers/net/ethernet/mellanox/mlx5/core/thermal.c | 108 + + drivers/net/ethernet/mellanox/mlx5/core/thermal.h | 20 + + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 165 +- + drivers/net/ethernet/micrel/ksz884x.c | 304 +-- + drivers/net/ethernet/microchip/lan743x_main.c | 1 - + drivers/net/ethernet/microchip/lan966x/Kconfig | 1 - + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 76 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 43 +- + .../ethernet/microchip/lan966x/lan966x_police.c | 13 +- + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 20 +- + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 36 + + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 221 +- + .../microchip/lan966x/lan966x_vcap_ag_api.c | 1402 +++++++++++- + .../microchip/lan966x/lan966x_vcap_debugfs.c | 133 +- + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 192 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 1 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 1 + + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 209 +- + .../microchip/sparx5/sparx5_vcap_debugfs.c | 2 +- + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 270 +++ + .../ethernet/microchip/sparx5/sparx5_vcap_impl.h | 6 + + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 217 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 61 + + .../net/ethernet/microchip/vcap/vcap_api_client.h | 11 + + .../microchip/vcap/vcap_api_debugfs_kunit.c | 4 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 2 - + drivers/net/ethernet/microsoft/mana/mana_bpf.c | 22 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 445 +++- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 52 +- + drivers/net/ethernet/mscc/ocelot.c | 97 + + drivers/net/ethernet/mscc/ocelot.h | 9 + + drivers/net/ethernet/mscc/ocelot_io.c | 50 +- + drivers/net/ethernet/mscc/ocelot_net.c | 50 +- + drivers/net/ethernet/mscc/ocelot_stats.c | 42 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 30 - + .../net/ethernet/netronome/nfp/flower/conntrack.c | 260 ++- + .../net/ethernet/netronome/nfp/flower/conntrack.h | 32 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_hwmon.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_port.c | 1 + + drivers/net/ethernet/ni/nixge.c | 2 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 - + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 5 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 2 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 10 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 9 - + drivers/net/ethernet/qlogic/qede/qede.h | 2 - + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 1 - + drivers/net/ethernet/qlogic/qede/qede_main.c | 1 - + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 1 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 1 - + drivers/net/ethernet/qualcomm/Kconfig | 1 + + drivers/net/ethernet/realtek/r8169_main.c | 187 +- + drivers/net/ethernet/renesas/ravb_main.c | 15 - + drivers/net/ethernet/renesas/rswitch.c | 4 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 2 +- + drivers/net/ethernet/sfc/ef100.c | 3 - + drivers/net/ethernet/sfc/efx.c | 5 - + drivers/net/ethernet/sfc/falcon/efx.c | 9 - + drivers/net/ethernet/sfc/mae.c | 239 +- + drivers/net/ethernet/sfc/mae.h | 11 + + drivers/net/ethernet/sfc/mcdi.h | 5 + + drivers/net/ethernet/sfc/ptp.c | 274 ++- + drivers/net/ethernet/sfc/siena/efx.c | 5 - + drivers/net/ethernet/sfc/tc.c | 642 +++++- + drivers/net/ethernet/sfc/tc.h | 41 + + drivers/net/ethernet/smsc/smc91x.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 14 +- + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 27 + + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 180 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 197 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 36 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 3 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 101 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 50 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 201 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 92 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 105 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 22 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 18 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 9 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 71 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/hwif.c | 13 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 179 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 10 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 9 - + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 3 +- + drivers/net/ethernet/sun/sunhme.c | 1190 ++++------ + drivers/net/ethernet/sun/sunhme.h | 6 +- + drivers/net/ethernet/sunplus/spl2sw_phy.c | 4 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 105 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 + + drivers/net/ethernet/ti/am65-cpsw-qos.c | 113 + + drivers/net/ethernet/ti/am65-cpsw-qos.h | 4 + + drivers/net/ethernet/ti/am65-cpts.c | 34 +- + drivers/net/ethernet/ti/netcp_core.c | 4 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 21 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 1 + + drivers/net/ethernet/wangxun/libwx/wx_type.h | 7 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 9 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 1 - + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 10 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 1 - + drivers/net/fddi/skfp/rmt.c | 6 +- + drivers/net/geneve.c | 11 +- + drivers/net/ieee802154/adf7242.c | 3 +- + drivers/net/ieee802154/at86rf230.c | 2 +- + drivers/net/ieee802154/ca8210.c | 3 +- + drivers/net/ieee802154/mcr20a.c | 2 +- + drivers/net/ipa/Makefile | 12 +- + drivers/net/ipa/data/ipa_data-v5.0.c | 481 ++++ + drivers/net/ipa/gsi.h | 4 +- + drivers/net/ipa/gsi_reg.c | 3 + + drivers/net/ipa/gsi_reg.h | 1 + + drivers/net/ipa/ipa_data.h | 3 +- + drivers/net/ipa/ipa_main.c | 6 +- + drivers/net/ipa/ipa_reg.c | 2 + + drivers/net/ipa/ipa_reg.h | 1 + + drivers/net/ipa/ipa_sysfs.c | 2 + + drivers/net/ipa/reg/gsi_reg-v5.0.c | 317 +++ + drivers/net/ipa/reg/ipa_reg-v5.0.c | 564 +++++ + drivers/net/macvlan.c | 98 +- + drivers/net/mdio/Kconfig | 3 + + drivers/net/mdio/of_mdio.c | 4 +- + drivers/net/pcs/Kconfig | 7 + + drivers/net/pcs/Makefile | 1 + + drivers/net/pcs/pcs-lynx.c | 4 +- + drivers/net/pcs/pcs-mtk-lynxi.c | 305 +++ + drivers/net/pcs/pcs-xpcs.c | 23 +- + drivers/net/phy/Kconfig | 1 + + drivers/net/phy/aquantia_hwmon.c | 2 +- + drivers/net/phy/at803x.c | 3 +- + drivers/net/phy/bcm54140.c | 2 +- + drivers/net/phy/bcm7xxx.c | 22 +- + drivers/net/phy/dp83867.c | 28 +- + drivers/net/phy/marvell.c | 2 +- + drivers/net/phy/marvell10g.c | 2 +- + drivers/net/phy/meson-gxl.c | 81 +- + drivers/net/phy/micrel.c | 559 ++++- + drivers/net/phy/mxl-gpy.c | 37 +- + drivers/net/phy/nxp-tja11xx.c | 2 +- + drivers/net/phy/phy.c | 33 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/phy/phylink.c | 37 +- + drivers/net/phy/sfp-bus.c | 8 +- + drivers/net/phy/sfp.c | 68 +- + drivers/net/phy/smsc.c | 170 +- + drivers/net/phy/spi_ks8995.c | 2 +- + drivers/net/tap.c | 15 +- + drivers/net/thunderbolt/main.c | 25 +- + drivers/net/tun.c | 2 + + drivers/net/virtio_net.c | 6 +- + drivers/net/vxlan/Makefile | 2 +- + drivers/net/vxlan/vxlan_core.c | 109 +- + drivers/net/vxlan/vxlan_mdb.c | 1462 ++++++++++++ + drivers/net/vxlan/vxlan_private.h | 84 + + drivers/net/wireless/Kconfig | 75 +- + drivers/net/wireless/Makefile | 11 +- + drivers/net/wireless/ath/ath.h | 12 +- + drivers/net/wireless/ath/ath10k/ce.c | 52 - + drivers/net/wireless/ath/ath10k/mac.c | 1 - + drivers/net/wireless/ath/ath10k/snoc.c | 1 + + drivers/net/wireless/ath/ath11k/ahb.c | 10 +- + drivers/net/wireless/ath/ath11k/hw.c | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 255 ++- + drivers/net/wireless/ath/ath11k/peer.c | 5 +- + drivers/net/wireless/ath/ath11k/reg.c | 59 +- + drivers/net/wireless/ath/ath11k/wmi.c | 606 ++++- + drivers/net/wireless/ath/ath11k/wmi.h | 366 +++- + drivers/net/wireless/ath/ath12k/ce.c | 2 +- + drivers/net/wireless/ath/ath12k/core.h | 2 +- + drivers/net/wireless/ath/ath12k/dp.c | 7 +- + drivers/net/wireless/ath/ath12k/dp.h | 6 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 19 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 11 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +- + drivers/net/wireless/ath/ath12k/hal.c | 2 +- + drivers/net/wireless/ath/ath12k/hal.h | 12 +- + drivers/net/wireless/ath/ath12k/hal_desc.h | 10 +- + drivers/net/wireless/ath/ath12k/pci.c | 47 +- + drivers/net/wireless/ath/ath12k/pci.h | 6 + + drivers/net/wireless/ath/ath12k/rx_desc.h | 2 +- + drivers/net/wireless/ath/ath12k/wmi.c | 6 +- + drivers/net/wireless/ath/ath12k/wmi.h | 4 +- + drivers/net/wireless/ath/ath5k/ahb.c | 10 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 2 +- + drivers/net/wireless/ath/ath6kl/bmi.c | 2 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 4 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 19 + + drivers/net/wireless/ath/key.c | 2 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 4 +- + drivers/net/wireless/broadcom/b43legacy/dma.c | 8 - + drivers/net/wireless/broadcom/b43legacy/radio.c | 17 - + .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/acpi.c | 51 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 330 ++- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 25 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 118 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 11 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 49 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 6 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 157 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 9 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 61 +- + .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 3 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 - + .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 20 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.h | 3 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 76 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 18 + + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 184 +- + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 96 + + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 426 +++- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 27 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 86 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 32 +- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 58 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 17 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/img.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 20 +- + drivers/net/wireless/intel/iwlwifi/fw/rs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 4 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 6 + + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 26 +- + drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 4 + + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/binding.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 104 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 39 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 14 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 226 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 6 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 42 +- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 294 +++ + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 429 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2112 +++++++++++------- + drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 27 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c | 306 +++ + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 1074 +++++++++ + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 1058 +++++++++ + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 523 ++++- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 48 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 45 +- + drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 326 +++ + drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 180 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 83 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 38 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 637 +++++- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 33 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 38 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 684 +++--- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 132 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 8 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 12 +- + drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c | 173 ++ + drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h | 30 + + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 87 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 91 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 34 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 5 +- + drivers/net/wireless/legacy/Kconfig | 55 + + drivers/net/wireless/legacy/Makefile | 6 + + drivers/net/wireless/{ => legacy}/ray_cs.c | 0 + drivers/net/wireless/{ => legacy}/ray_cs.h | 0 + drivers/net/wireless/{ => legacy}/rayctl.h | 0 + drivers/net/wireless/{ => legacy}/rndis_wlan.c | 8 +- + drivers/net/wireless/{ => legacy}/wl3501.h | 0 + drivers/net/wireless/{ => legacy}/wl3501_cs.c | 0 + drivers/net/wireless/marvell/mwifiex/11h.c | 4 - + drivers/net/wireless/quantenna/qtnfmac/commands.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 1 + + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 313 ++- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 17 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 7 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 1878 ++++++++++++++++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 5 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 5 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 303 ++- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 44 + + drivers/net/wireless/realtek/rtlwifi/debug.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 25 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 6 - + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 9 - + drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 +- + drivers/net/wireless/realtek/rtw88/mac.c | 17 +- + drivers/net/wireless/realtek/rtw88/pci.c | 8 - + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 9 + + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 6 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 9 + + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 8 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 9 + + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 8 +- + drivers/net/wireless/realtek/rtw88/usb.c | 2 +- + drivers/net/wireless/realtek/rtw89/coex.c | 1268 +++++++++-- + drivers/net/wireless/realtek/rtw89/coex.h | 6 + + drivers/net/wireless/realtek/rtw89/core.c | 92 +- + drivers/net/wireless/realtek/rtw89/core.h | 274 ++- + drivers/net/wireless/realtek/rtw89/fw.c | 296 ++- + drivers/net/wireless/realtek/rtw89/fw.h | 145 ++ + drivers/net/wireless/realtek/rtw89/mac.c | 39 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 2 +- + drivers/net/wireless/realtek/rtw89/pci.c | 20 +- + drivers/net/wireless/realtek/rtw89/phy.c | 91 + + drivers/net/wireless/realtek/rtw89/phy.h | 4 + + drivers/net/wireless/realtek/rtw89/reg.h | 12 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 14 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 66 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 88 +- + drivers/net/wireless/realtek/rtw89/ser.c | 5 + + drivers/net/wireless/realtek/rtw89/wow.c | 9 - + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 7 +- + drivers/net/wireless/silabs/wfx/main.c | 10 +- + drivers/net/wireless/virtual/Kconfig | 20 + + drivers/net/wireless/virtual/Makefile | 3 + + .../net/wireless/{ => virtual}/mac80211_hwsim.c | 925 +++++++- + .../net/wireless/{ => virtual}/mac80211_hwsim.h | 58 + + drivers/net/wireless/{ => virtual}/virt_wifi.c | 0 + drivers/net/wwan/iosm/iosm_ipc_port.c | 3 +- + drivers/net/wwan/mhi_wwan_ctrl.c | 2 +- + drivers/net/wwan/rpmsg_wwan_ctrl.c | 2 +- + drivers/net/wwan/t7xx/t7xx_port_wwan.c | 36 +- + drivers/net/wwan/wwan_core.c | 58 +- + drivers/net/wwan/wwan_hwsim.c | 2 +- + drivers/nfc/nfcmrvl/i2c.c | 2 +- + drivers/nfc/nfcmrvl/main.c | 6 +- + drivers/nfc/nfcmrvl/nfcmrvl.h | 30 +- + drivers/nfc/nfcmrvl/uart.c | 11 +- + drivers/nfc/trf7970a.c | 2 +- + drivers/phy/mscc/phy-ocelot-serdes.c | 9 + + drivers/ptp/Kconfig | 14 + + drivers/ptp/Makefile | 1 + + drivers/ptp/ptp_dfl_tod.c | 332 +++ + drivers/ptp/ptp_ines.c | 2 +- + drivers/ptp/ptp_kvm_arm.c | 4 + + drivers/ptp/ptp_kvm_common.c | 1 + + drivers/ptp/ptp_kvm_x86.c | 59 +- + drivers/ptp/ptp_ocp.c | 1 + + drivers/s390/net/ism_drv.c | 10 +- + drivers/scsi/cxgbi/libcxgbi.c | 4 +- + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/vhost/vsock.c | 1 + + fs/dlm/lowcomms.c | 7 +- + include/linux/atomic/atomic-arch-fallback.h | 208 +- + include/linux/atomic/atomic-instrumented.h | 68 +- + include/linux/atomic/atomic-long.h | 38 +- + include/linux/bpf.h | 157 +- + include/linux/bpf_local_storage.h | 20 +- + include/linux/bpf_mem_alloc.h | 9 + + include/linux/bpf_verifier.h | 76 +- + include/linux/btf.h | 10 +- + include/linux/btf_ids.h | 2 +- + include/linux/cpu_rmap.h | 4 +- + include/linux/dccp.h | 6 +- + include/linux/ethtool.h | 14 +- + include/linux/ethtool_netlink.h | 6 + + include/linux/filter.h | 55 +- + include/linux/igmp.h | 2 +- + include/linux/ipv6.h | 5 +- + include/linux/mlx5/device.h | 8 + + include/linux/mlx5/driver.h | 10 + + include/linux/mlx5/mlx5_ifc.h | 74 +- + include/linux/mlx5/port.h | 16 + + include/linux/mlx5/qp.h | 10 + + include/linux/module.h | 127 +- + include/linux/net_tstamp.h | 33 + + include/linux/netdevice.h | 65 +- + include/linux/netfilter_ipv6.h | 2 + + include/linux/netlink.h | 23 +- + include/linux/pcs/pcs-mtk-lynxi.h | 13 + + include/linux/phy.h | 5 +- + include/linux/phylink.h | 2 - + include/linux/platform_data/nfcmrvl.h | 48 - + include/linux/ptp_kvm.h | 1 + + include/linux/rcuref.h | 155 ++ + include/linux/rtnetlink.h | 10 - + include/linux/sched.h | 7 +- + include/linux/skbuff.h | 58 +- + include/linux/smscphy.h | 10 + + include/linux/soc/mediatek/mtk_wed.h | 6 + + include/linux/stmmac.h | 20 + + include/linux/tcp.h | 10 +- + include/linux/types.h | 6 + + include/linux/udp.h | 5 +- + include/linux/virtio_vsock.h | 1 + + include/linux/wwan.h | 11 + + include/net/addrconf.h | 2 +- + include/net/af_unix.h | 6 +- + include/net/af_vsock.h | 17 + + include/net/arp.h | 8 +- + include/net/ax25.h | 5 +- + include/net/cfg80211.h | 75 +- + include/net/dsa.h | 51 - + include/net/dsa_stubs.h | 48 + + include/net/dst.h | 30 +- + include/net/fou.h | 2 + + include/net/ieee80211_radiotap.h | 215 +- + include/net/inet_sock.h | 5 +- + include/net/ip6_fib.h | 12 +- + include/net/ip6_route.h | 2 +- + include/net/ip_tunnels.h | 38 +- + include/net/mac80211.h | 169 +- + include/net/mana/gdma.h | 4 + + include/net/mana/mana.h | 45 +- + include/net/ndisc.h | 12 +- + include/net/neighbour.h | 10 +- + include/net/netdev_queues.h | 163 ++ + include/net/netfilter/nf_nat_redirect.h | 3 +- + include/net/nexthop.h | 6 +- + include/net/pkt_sched.h | 4 +- + include/net/raw.h | 7 +- + include/net/rawv6.h | 2 +- + include/net/route.h | 3 - + include/net/scm.h | 13 +- + include/net/sctp/stream_sched.h | 2 + + include/net/sctp/structs.h | 8 + + include/net/smc.h | 1 + + include/net/sock.h | 2 +- + include/net/tcp.h | 5 +- + include/net/vxlan.h | 25 + + include/net/x25.h | 5 +- + include/net/xdp.h | 29 - + include/net/xdp_sock.h | 1 + + include/net/xfrm.h | 5 + + include/net/xsk_buff_pool.h | 9 +- + include/soc/mscc/ocelot.h | 29 +- + include/trace/events/fib.h | 5 +- + include/trace/events/fib6.h | 5 +- + include/trace/events/qrtr.h | 33 +- + include/trace/events/sock.h | 4 +- + include/trace/events/tcp.h | 2 +- + include/uapi/linux/bpf.h | 94 +- + include/uapi/linux/ethtool_netlink.h | 2 + + include/uapi/linux/if_bridge.h | 10 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/netfilter/nf_tables.h | 10 +- + include/uapi/linux/netfilter/nfnetlink_queue.h | 1 + + include/uapi/linux/nl80211.h | 59 +- + include/uapi/linux/pkt_sched.h | 17 + + include/uapi/linux/sctp.h | 4 +- + include/uapi/linux/tc_act/tc_tunnel_key.h | 1 + + include/uapi/linux/virtio_net.h | 1 + + io_uring/rsrc.c | 3 +- + kernel/bpf/Makefile | 3 +- + kernel/bpf/arraymap.c | 40 +- + kernel/bpf/bloom_filter.c | 41 +- + kernel/bpf/bpf_cgrp_storage.c | 24 +- + kernel/bpf/bpf_inode_storage.c | 23 +- + kernel/bpf/bpf_iter.c | 70 + + kernel/bpf/bpf_local_storage.c | 371 +++- + kernel/bpf/bpf_struct_ops.c | 276 ++- + kernel/bpf/bpf_task_storage.c | 28 +- + kernel/bpf/btf.c | 319 ++- + kernel/bpf/cgroup.c | 53 +- + kernel/bpf/cpumap.c | 18 +- + kernel/bpf/cpumask.c | 87 +- + kernel/bpf/devmap.c | 50 +- + kernel/bpf/hashtab.c | 140 +- + kernel/bpf/helpers.c | 396 ++-- + kernel/bpf/local_storage.c | 13 +- + kernel/bpf/log.c | 330 +++ + kernel/bpf/lpm_trie.c | 17 +- + kernel/bpf/memalloc.c | 59 +- + kernel/bpf/offload.c | 6 + + kernel/bpf/queue_stack_maps.c | 32 +- + kernel/bpf/reuseport_array.c | 10 +- + kernel/bpf/ringbuf.c | 26 +- + kernel/bpf/stackmap.c | 20 +- + kernel/bpf/syscall.c | 140 +- + kernel/bpf/trampoline.c | 28 - + kernel/bpf/verifier.c | 2041 ++++++++++++----- + kernel/cgroup/cgroup.c | 14 +- + kernel/module/internal.h | 1 - + kernel/module/kallsyms.c | 16 +- + kernel/trace/bpf_trace.c | 4 - + lib/Makefile | 2 +- + lib/cpu_rmap.c | 57 +- + lib/packing.c | 1 - + lib/rcuref.c | 281 +++ + mm/maccess.c | 16 +- + mm/usercopy.c | 2 +- + net/6lowpan/iphc.c | 2 +- + net/8021q/vlan_dev.c | 2 +- + net/Kconfig | 12 + + net/Makefile | 2 +- + net/atm/signaling.c | 2 +- + net/bpf/bpf_dummy_struct_ops.c | 14 +- + net/bpf/test_run.c | 37 +- + net/bridge/br_arp_nd_proxy.c | 4 +- + net/bridge/br_device.c | 3 + + net/bridge/br_mdb.c | 219 +- + net/bridge/br_netfilter_hooks.c | 3 +- + net/bridge/br_netfilter_ipv6.c | 79 +- + net/bridge/br_netlink.c | 3 - + net/bridge/br_nf_core.c | 2 +- + net/bridge/br_private.h | 22 +- + net/bridge/netfilter/nft_meta_bridge.c | 71 +- + net/can/isotp.c | 65 +- + net/compat.c | 13 +- + net/core/bpf_sk_storage.c | 25 +- + net/core/datagram.c | 14 +- + net/core/dev.c | 82 +- + net/core/dev_ioctl.c | 105 +- + net/core/dst.c | 26 +- + net/core/filter.c | 242 +- + net/core/neighbour.c | 123 +- + net/core/net-procfs.c | 18 +- + net/core/netdev-genl-gen.c | 2 +- + net/core/rtnetlink.c | 220 +- + net/core/scm.c | 9 +- + net/core/skbuff.c | 8 +- + net/core/sock.c | 13 +- + net/core/sock_map.c | 28 +- + net/core/xdp.c | 19 +- + net/dccp/ipv4.c | 12 +- + net/dccp/ipv6.c | 12 +- + net/dccp/timer.c | 2 +- + net/dsa/Makefile | 12 +- + net/dsa/dsa.c | 19 + + net/dsa/master.c | 50 +- + net/dsa/master.h | 3 + + net/dsa/port.c | 34 +- + net/dsa/port.h | 2 +- + net/dsa/stubs.c | 10 + + net/dsa/switch.c | 85 +- + net/dsa/trace.c | 39 + + net/dsa/trace.h | 447 ++++ + net/ethtool/ioctl.c | 10 +- + net/ethtool/mm.c | 23 + + net/ethtool/netlink.h | 2 +- + net/ethtool/rings.c | 34 +- + net/ipv4/Makefile | 2 +- + net/ipv4/af_inet.c | 2 +- + net/ipv4/arp.c | 8 +- + net/ipv4/bpf_tcp_ca.c | 23 +- + net/ipv4/devinet.c | 3 + + net/ipv4/fib_semantics.c | 8 +- + net/ipv4/fou_bpf.c | 119 + + net/ipv4/fou_core.c | 5 + + net/ipv4/igmp.c | 4 +- + net/ipv4/inet_hashtables.c | 11 +- + net/ipv4/ip_output.c | 13 +- + net/ipv4/ip_tunnel.c | 22 +- + net/ipv4/ipip.c | 1 + + net/ipv4/netfilter/ip_tables.c | 68 +- + net/ipv4/nexthop.c | 12 +- + net/ipv4/raw.c | 4 +- + net/ipv4/raw_diag.c | 2 +- + net/ipv4/route.c | 26 +- + net/ipv4/tcp.c | 17 +- + net/ipv4/tcp_cong.c | 66 +- + net/ipv4/tcp_input.c | 14 +- + net/ipv4/tcp_ipv4.c | 10 +- + net/ipv4/tcp_minisocks.c | 5 +- + net/ipv4/tcp_output.c | 11 +- + net/ipv4/tcp_recovery.c | 2 +- + net/ipv4/tcp_timer.c | 6 +- + net/ipv4/udp.c | 31 +- + net/ipv4/xfrm4_policy.c | 4 +- + net/ipv6/addrconf.c | 17 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/inet6_connection_sock.c | 2 +- + net/ipv6/ip6_flowlabel.c | 51 +- + net/ipv6/ip6_input.c | 14 +- + net/ipv6/ip6_output.c | 14 +- + net/ipv6/ipv6_sockglue.c | 1 + + net/ipv6/mcast.c | 8 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/netfilter/ip6_tables.c | 68 +- + net/ipv6/ping.c | 2 +- + net/ipv6/raw.c | 7 +- + net/ipv6/route.c | 54 +- + net/ipv6/sit.c | 2 +- + net/ipv6/tcp_ipv6.c | 17 +- + net/ipv6/udp.c | 8 +- + net/ipv6/xfrm6_policy.c | 4 +- + net/mac80211/agg-tx.c | 17 + + net/mac80211/cfg.c | 116 +- + net/mac80211/debugfs_netdev.c | 223 +- + net/mac80211/debugfs_netdev.h | 16 + + net/mac80211/driver-ops.c | 25 +- + net/mac80211/driver-ops.h | 33 + + net/mac80211/ieee80211_i.h | 59 +- + net/mac80211/iface.c | 11 + + net/mac80211/link.c | 5 + + net/mac80211/mesh.c | 171 +- + net/mac80211/mesh.h | 48 + + net/mac80211/mesh_hwmp.c | 37 +- + net/mac80211/mesh_pathtbl.c | 282 +++ + net/mac80211/mesh_plink.c | 16 +- + net/mac80211/mlme.c | 6 +- + net/mac80211/rc80211_minstrel_ht.c | 6 - + net/mac80211/rx.c | 224 +- + net/mac80211/scan.c | 8 +- + net/mac80211/sta_info.h | 9 +- + net/mac80211/trace.h | 25 + + net/mac80211/tx.c | 207 +- + net/mac80211/util.c | 94 + + net/mctp/af_mctp.c | 1 - + net/mptcp/pm_netlink.c | 2 +- + net/mptcp/protocol.c | 10 +- + net/mptcp/protocol.h | 9 +- + net/mptcp/sockopt.c | 22 +- + net/mptcp/subflow.c | 47 +- + net/netfilter/Kconfig | 1 - + net/netfilter/ipvs/ip_vs_xmit.c | 4 +- + net/netfilter/nf_conntrack_bpf.c | 5 +- + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 8 - + net/netfilter/nf_conntrack_ovs.c | 11 +- + net/netfilter/nf_nat_core.c | 4 +- + net/netfilter/nf_nat_redirect.c | 71 +- + net/netfilter/nfnetlink_log.c | 36 +- + net/netfilter/nfnetlink_queue.c | 20 + + net/netfilter/nft_masq.c | 75 +- + net/netfilter/nft_redir.c | 84 +- + net/netfilter/utils.c | 52 + + net/netfilter/xt_REDIRECT.c | 10 +- + net/netfilter/xt_tcpudp.c | 110 + + net/netlink/af_netlink.c | 2 - + net/netlink/af_netlink.h | 1 - + net/packet/af_packet.c | 116 +- + net/packet/diag.c | 12 +- + net/packet/internal.h | 37 +- + net/sched/act_api.c | 8 +- + net/sched/act_mirred.c | 2 +- + net/sched/act_mpls.c | 2 +- + net/sched/act_tunnel_key.c | 5 + + net/sched/cls_flower.c | 2 +- + net/sched/em_meta.c | 2 +- + net/sched/sch_api.c | 6 +- + net/sched/sch_cake.c | 6 +- + net/sched/sch_mqprio.c | 196 +- + net/sched/sch_mqprio_lib.c | 14 + + net/sched/sch_mqprio_lib.h | 2 + + net/sched/sch_pie.c | 2 +- + net/sched/sch_taprio.c | 77 +- + net/sctp/Makefile | 3 +- + net/sctp/input.c | 2 +- + net/sctp/ipv6.c | 2 +- + net/sctp/stream_sched.c | 2 + + net/sctp/stream_sched_fc.c | 225 ++ + net/smc/smc.h | 5 +- + net/smc/smc_core.h | 10 +- + net/smc/smc_ism.c | 2 +- + net/smc/smc_wr.c | 35 +- + net/smc/smc_wr.h | 5 +- + net/socket.c | 2 +- + net/unix/af_unix.c | 9 +- + net/unix/garbage.c | 2 +- + net/unix/scm.c | 6 + + net/vmw_vsock/Makefile | 1 + + net/vmw_vsock/af_vsock.c | 68 +- + net/vmw_vsock/virtio_transport.c | 2 + + net/vmw_vsock/virtio_transport_common.c | 96 +- + net/vmw_vsock/vmci_transport.c | 11 +- + net/vmw_vsock/vsock_bpf.c | 174 ++ + net/vmw_vsock/vsock_loopback.c | 5 +- + net/wireless/mlme.c | 55 +- + net/wireless/nl80211.c | 171 +- + net/wireless/rdev-ops.h | 17 + + net/wireless/scan.c | 38 +- + net/wireless/trace.h | 36 +- + net/wireless/util.c | 36 +- + net/xdp/xsk.c | 9 +- + net/xdp/xsk_queue.h | 19 +- + net/xdp/xskmap.c | 21 +- + net/xfrm/xfrm_device.c | 2 +- + net/xfrm/xfrm_state.c | 1 + + net/xfrm/xfrm_user.c | 2 + + samples/bpf/cpustat_kern.c | 4 +- + samples/bpf/hbm.c | 5 +- + samples/bpf/ibumad_kern.c | 4 +- + samples/bpf/lwt_len_hist.sh | 2 +- + samples/bpf/offwaketime_kern.c | 2 +- + samples/bpf/task_fd_query_user.c | 4 +- + samples/bpf/test_lwt_bpf.sh | 2 +- + samples/bpf/test_overhead_tp.bpf.c | 4 +- + scripts/atomic/atomics.tbl | 2 +- + scripts/atomic/fallbacks/add_negative | 11 +- + scripts/bpf_doc.py | 2 +- + security/lsm_audit.c | 6 +- + tools/arch/arm64/include/uapi/asm/bpf_perf_event.h | 9 - + tools/arch/s390/include/uapi/asm/bpf_perf_event.h | 9 - + tools/arch/s390/include/uapi/asm/ptrace.h | 458 ---- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 18 +- + tools/bpf/bpftool/bash-completion/bpftool | 42 +- + tools/bpf/bpftool/btf_dumper.c | 83 + + tools/bpf/bpftool/cfg.c | 29 +- + tools/bpf/bpftool/cfg.h | 5 +- + tools/bpf/bpftool/json_writer.c | 5 +- + tools/bpf/bpftool/json_writer.h | 1 + + tools/bpf/bpftool/main.h | 2 + + tools/bpf/bpftool/prog.c | 81 +- + tools/bpf/bpftool/xlated_dumper.c | 54 +- + tools/bpf/bpftool/xlated_dumper.h | 3 +- + tools/bpf/resolve_btfids/.gitignore | 1 + + tools/include/uapi/linux/bpf.h | 94 +- + tools/include/uapi/linux/if_link.h | 1 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/bpf.c | 25 +- + tools/lib/bpf/bpf.h | 94 +- + tools/lib/bpf/bpf_gen_internal.h | 4 +- + tools/lib/bpf/bpf_helpers.h | 7 +- + tools/lib/bpf/bpf_tracing.h | 3 + + tools/lib/bpf/btf.c | 2 - + tools/lib/bpf/gen_loader.c | 48 +- + tools/lib/bpf/libbpf.c | 442 +++- + tools/lib/bpf/libbpf.h | 53 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/linker.c | 25 +- + tools/lib/bpf/netlink.c | 8 +- + tools/lib/bpf/relo_core.c | 3 - + tools/lib/bpf/usdt.c | 196 +- + tools/lib/bpf/zip.c | 333 +++ + tools/lib/bpf/zip.h | 47 + + tools/net/ynl/ethtool.py | 424 ++++ + tools/net/ynl/lib/nlspec.py | 91 +- + tools/net/ynl/lib/ynl.py | 120 +- + tools/net/ynl/requirements.txt | 2 + + tools/net/ynl/ynl-gen-c.py | 7 +- + tools/scripts/Makefile.include | 2 + + tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 + + tools/testing/selftests/bpf/DENYLIST.s390x | 4 + + tools/testing/selftests/bpf/Makefile | 23 +- + tools/testing/selftests/bpf/autoconf_helper.h | 9 + + tools/testing/selftests/bpf/bench.c | 4 + + .../bpf/benchs/bench_local_storage_create.c | 264 +++ + tools/testing/selftests/bpf/bpf_kfuncs.h | 38 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 60 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 6 + + tools/testing/selftests/bpf/config.aarch64 | 2 + + tools/testing/selftests/bpf/config.s390x | 3 + + tools/testing/selftests/bpf/config.x86_64 | 3 + + tools/testing/selftests/bpf/disasm.c | 1 + + tools/testing/selftests/bpf/disasm.h | 1 + + tools/testing/selftests/bpf/get_cgroup_id_user.c | 9 +- + tools/testing/selftests/bpf/json_writer.c | 1 + + tools/testing/selftests/bpf/json_writer.h | 1 + + tools/testing/selftests/bpf/network_helpers.c | 2 +- + tools/testing/selftests/bpf/prog_tests/align.c | 22 +- + .../selftests/bpf/prog_tests/attach_probe.c | 291 ++- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 160 ++ + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 6 + + .../selftests/bpf/prog_tests/cg_storage_multi.c | 8 +- + .../testing/selftests/bpf/prog_tests/cgrp_kfunc.c | 1 + + .../selftests/bpf/prog_tests/cgrp_local_storage.c | 14 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 25 + + tools/testing/selftests/bpf/prog_tests/cpumask.c | 2 +- + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 917 ++++++++ + .../selftests/bpf/prog_tests/decap_sanity.c | 16 +- + tools/testing/selftests/bpf/prog_tests/dynptr.c | 74 +- + tools/testing/selftests/bpf/prog_tests/empty_skb.c | 25 +- + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 38 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 24 + + .../selftests/bpf/prog_tests/get_branch_snapshot.c | 4 +- + .../bpf/prog_tests/get_stackid_cannot_attach.c | 1 + + tools/testing/selftests/bpf/prog_tests/iters.c | 106 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 11 +- + tools/testing/selftests/bpf/prog_tests/l4lb_all.c | 2 + + .../selftests/bpf/prog_tests/local_kptr_stash.c | 60 + + tools/testing/selftests/bpf/prog_tests/log_fixup.c | 3 +- + tools/testing/selftests/bpf/prog_tests/map_kptr.c | 136 +- + tools/testing/selftests/bpf/prog_tests/map_ops.c | 162 ++ + .../bpf/prog_tests/module_fentry_shadow.c | 128 ++ + tools/testing/selftests/bpf/prog_tests/mptcp.c | 19 +- + .../selftests/bpf/prog_tests/parse_tcp_hdr_opt.c | 93 + + .../selftests/bpf/prog_tests/perf_event_stackmap.c | 3 +- + .../selftests/bpf/prog_tests/rcu_read_lock.c | 16 +- + .../testing/selftests/bpf/prog_tests/send_signal.c | 6 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 163 ++ + .../selftests/bpf/prog_tests/stacktrace_build_id.c | 19 +- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 32 +- + .../selftests/bpf/prog_tests/task_fd_query_tp.c | 9 +- + .../testing/selftests/bpf/prog_tests/task_kfunc.c | 3 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 100 +- + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 4 +- + tools/testing/selftests/bpf/prog_tests/test_ima.c | 29 +- + .../selftests/bpf/prog_tests/test_local_storage.c | 54 +- + .../testing/selftests/bpf/prog_tests/test_tunnel.c | 224 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 3 + + .../selftests/bpf/prog_tests/tp_attach_query.c | 9 +- + .../selftests/bpf/prog_tests/trace_printk.c | 10 +- + .../selftests/bpf/prog_tests/trace_vprintk.c | 10 +- + .../selftests/bpf/prog_tests/uprobe_autoattach.c | 1 - + .../selftests/bpf/prog_tests/user_ringbuf.c | 2 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 108 + + .../selftests/bpf/prog_tests/verifier_log.c | 450 ++++ + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 11 +- + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 40 +- + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 37 +- + .../selftests/bpf/prog_tests/xdp_metadata.c | 23 +- + .../selftests/bpf/prog_tests/xdp_synproxy.c | 41 +- + tools/testing/selftests/bpf/prog_tests/xfrm_info.c | 67 +- + .../bpf/progs/bench_local_storage_create.c | 82 + + tools/testing/selftests/bpf/progs/bpf_flow.c | 2 +- + tools/testing/selftests/bpf/progs/bpf_iter_ksym.c | 1 - + .../selftests/bpf/progs/bpf_iter_setsockopt.c | 1 - + tools/testing/selftests/bpf/progs/bpf_loop.c | 2 - + tools/testing/selftests/bpf/progs/bpf_misc.h | 171 ++ + tools/testing/selftests/bpf/progs/cb_refs.c | 3 +- + .../bpf/progs/cgroup_skb_sk_lookup_kern.c | 1 - + .../selftests/bpf/progs/cgrp_kfunc_common.h | 11 +- + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 104 +- + .../selftests/bpf/progs/cgrp_kfunc_success.c | 69 +- + .../selftests/bpf/progs/cgrp_ls_attach_cgroup.c | 1 - + .../selftests/bpf/progs/cgrp_ls_sleepable.c | 5 +- + tools/testing/selftests/bpf/progs/connect4_prog.c | 2 +- + tools/testing/selftests/bpf/progs/core_kern.c | 2 +- + tools/testing/selftests/bpf/progs/cpumask_common.h | 9 +- + .../testing/selftests/bpf/progs/cpumask_failure.c | 98 +- + .../testing/selftests/bpf/progs/cpumask_success.c | 30 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 292 ++- + tools/testing/selftests/bpf/progs/dynptr_success.c | 54 +- + tools/testing/selftests/bpf/progs/err.h | 18 + + tools/testing/selftests/bpf/progs/fexit_bpf2bpf.c | 2 - + tools/testing/selftests/bpf/progs/find_vma_fail1.c | 2 +- + .../selftests/bpf/progs/freplace_attach_probe.c | 2 +- + tools/testing/selftests/bpf/progs/iters.c | 719 ++++++ + tools/testing/selftests/bpf/progs/iters_looping.c | 163 ++ + tools/testing/selftests/bpf/progs/iters_num.c | 242 ++ + .../selftests/bpf/progs/iters_state_safety.c | 426 ++++ + .../selftests/bpf/progs/iters_testmod_seq.c | 79 + + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 2 +- + tools/testing/selftests/bpf/progs/linked_funcs1.c | 3 + + tools/testing/selftests/bpf/progs/linked_funcs2.c | 3 + + tools/testing/selftests/bpf/progs/linked_list.c | 4 - + .../testing/selftests/bpf/progs/linked_list_fail.c | 1 - + .../testing/selftests/bpf/progs/local_kptr_stash.c | 108 + + tools/testing/selftests/bpf/progs/local_storage.c | 76 +- + tools/testing/selftests/bpf/progs/loop6.c | 3 + + tools/testing/selftests/bpf/progs/lru_bug.c | 2 +- + tools/testing/selftests/bpf/progs/lsm.c | 4 +- + tools/testing/selftests/bpf/progs/map_kptr.c | 357 ++- + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 33 +- + .../selftests/bpf/progs/nested_trust_failure.c | 2 +- + tools/testing/selftests/bpf/progs/netcnt_prog.c | 1 - + .../selftests/bpf/progs/netif_receive_skb.c | 1 - + tools/testing/selftests/bpf/progs/perfbuf_bench.c | 1 - + tools/testing/selftests/bpf/progs/profiler.inc.h | 3 +- + tools/testing/selftests/bpf/progs/pyperf.h | 16 +- + tools/testing/selftests/bpf/progs/pyperf600_iter.c | 7 + + .../selftests/bpf/progs/pyperf600_nounroll.c | 3 - + tools/testing/selftests/bpf/progs/rbtree.c | 2 +- + .../bpf/progs/rbtree_btf_fail__wrong_node_type.c | 11 - + tools/testing/selftests/bpf/progs/rbtree_fail.c | 10 +- + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 19 +- + .../selftests/bpf/progs/rcu_tasks_trace_gp.c | 36 + + .../bpf/progs/read_bpf_task_storage_busy.c | 1 - + tools/testing/selftests/bpf/progs/recvmsg4_prog.c | 2 - + tools/testing/selftests/bpf/progs/recvmsg6_prog.c | 2 - + tools/testing/selftests/bpf/progs/sendmsg4_prog.c | 2 - + .../selftests/bpf/progs/sockmap_verdict_prog.c | 4 + + tools/testing/selftests/bpf/progs/strobemeta.h | 1 - + .../selftests/bpf/progs/tailcall_bpf2bpf3.c | 11 + + .../selftests/bpf/progs/tailcall_bpf2bpf6.c | 3 + + .../selftests/bpf/progs/task_kfunc_common.h | 8 +- + .../selftests/bpf/progs/task_kfunc_failure.c | 178 +- + .../selftests/bpf/progs/task_kfunc_success.c | 78 +- + tools/testing/selftests/bpf/progs/tcp_ca_update.c | 80 + + .../selftests/bpf/progs/tcp_ca_write_sk_pacing.c | 13 +- + .../bpf/progs/test_attach_kprobe_sleepable.c | 23 + + .../selftests/bpf/progs/test_attach_probe.c | 35 +- + .../selftests/bpf/progs/test_attach_probe_manual.c | 53 + + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 1 - + .../selftests/bpf/progs/test_cls_redirect_dynptr.c | 979 +++++++++ + .../bpf/progs/test_core_reloc_bitfields_probed.c | 1 - + .../selftests/bpf/progs/test_global_func1.c | 4 + + .../selftests/bpf/progs/test_global_func2.c | 4 + + .../selftests/bpf/progs/test_hash_large_key.c | 2 +- + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 2 +- + .../bpf/progs/test_ksyms_btf_write_check.c | 1 - + .../testing/selftests/bpf/progs/test_ksyms_weak.c | 17 +- + .../bpf/progs/test_l4lb_noinline_dynptr.c | 487 ++++ + .../selftests/bpf/progs/test_legacy_printk.c | 2 +- + tools/testing/selftests/bpf/progs/test_map_lock.c | 2 +- + tools/testing/selftests/bpf/progs/test_map_ops.c | 138 ++ + tools/testing/selftests/bpf/progs/test_obj_id.c | 2 + + .../selftests/bpf/progs/test_parse_tcp_hdr_opt.c | 118 + + .../bpf/progs/test_parse_tcp_hdr_opt_dynptr.c | 114 + + .../testing/selftests/bpf/progs/test_pkt_access.c | 5 + + tools/testing/selftests/bpf/progs/test_ringbuf.c | 1 - + .../selftests/bpf/progs/test_ringbuf_map_key.c | 1 + + .../selftests/bpf/progs/test_ringbuf_multi.c | 1 - + .../bpf/progs/test_select_reuseport_kern.c | 2 +- + tools/testing/selftests/bpf/progs/test_sk_assign.c | 4 +- + tools/testing/selftests/bpf/progs/test_sk_lookup.c | 9 +- + .../selftests/bpf/progs/test_sk_lookup_kern.c | 4 +- + .../selftests/bpf/progs/test_sk_storage_tracing.c | 16 + + .../testing/selftests/bpf/progs/test_sock_fields.c | 2 +- + .../selftests/bpf/progs/test_sockmap_kern.h | 14 +- + tools/testing/selftests/bpf/progs/test_spin_lock.c | 3 + + .../selftests/bpf/progs/test_stacktrace_map.c | 2 +- + tools/testing/selftests/bpf/progs/test_tc_dtime.c | 4 +- + tools/testing/selftests/bpf/progs/test_tc_neigh.c | 4 +- + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 2 - + .../testing/selftests/bpf/progs/test_tracepoint.c | 2 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 133 +- + .../selftests/bpf/progs/test_usdt_multispec.c | 2 - + .../selftests/bpf/progs/test_verif_scale1.c | 2 +- + .../selftests/bpf/progs/test_verif_scale2.c | 2 +- + .../selftests/bpf/progs/test_verif_scale3.c | 2 +- + .../bpf/progs/test_xdp_adjust_tail_grow.c | 2 - + .../testing/selftests/bpf/progs/test_xdp_bpf2bpf.c | 2 - + .../selftests/bpf/progs/test_xdp_do_redirect.c | 38 +- + .../testing/selftests/bpf/progs/test_xdp_dynptr.c | 255 +++ + .../selftests/bpf/progs/test_xdp_noinline.c | 43 - + tools/testing/selftests/bpf/progs/test_xdp_vlan.c | 13 - + tools/testing/selftests/bpf/progs/timer.c | 45 + + tools/testing/selftests/bpf/progs/type_cast.c | 1 - + tools/testing/selftests/bpf/progs/udp_limit.c | 2 - + .../selftests/bpf/progs/user_ringbuf_success.c | 8 +- + tools/testing/selftests/bpf/progs/verifier_and.c | 107 + + .../selftests/bpf/progs/verifier_array_access.c | 529 +++++ + .../selftests/bpf/progs/verifier_basic_stack.c | 100 + + .../bpf/progs/verifier_bounds_deduction.c | 171 ++ + .../progs/verifier_bounds_deduction_non_const.c | 639 ++++++ + .../bpf/progs/verifier_bounds_mix_sign_unsign.c | 554 +++++ + tools/testing/selftests/bpf/progs/verifier_cfg.c | 100 + + .../bpf/progs/verifier_cgroup_inv_retcode.c | 89 + + .../selftests/bpf/progs/verifier_cgroup_skb.c | 227 ++ + .../selftests/bpf/progs/verifier_cgroup_storage.c | 308 +++ + .../selftests/bpf/progs/verifier_const_or.c | 82 + + .../selftests/bpf/progs/verifier_ctx_sk_msg.c | 228 ++ + .../verifier_direct_stack_access_wraparound.c | 56 + + tools/testing/selftests/bpf/progs/verifier_div0.c | 213 ++ + .../selftests/bpf/progs/verifier_div_overflow.c | 144 ++ + .../bpf/progs/verifier_helper_access_var_len.c | 825 +++++++ + .../bpf/progs/verifier_helper_packet_access.c | 550 +++++ + .../bpf/progs/verifier_helper_restricted.c | 279 +++ + .../bpf/progs/verifier_helper_value_access.c | 1245 +++++++++++ + .../testing/selftests/bpf/progs/verifier_int_ptr.c | 157 ++ + .../testing/selftests/bpf/progs/verifier_ld_ind.c | 110 + + .../selftests/bpf/progs/verifier_leak_ptr.c | 92 + + .../testing/selftests/bpf/progs/verifier_map_ptr.c | 159 ++ + .../selftests/bpf/progs/verifier_map_ret_val.c | 110 + + .../testing/selftests/bpf/progs/verifier_masking.c | 410 ++++ + .../selftests/bpf/progs/verifier_meta_access.c | 284 +++ + .../selftests/bpf/progs/verifier_raw_stack.c | 371 ++++ + .../selftests/bpf/progs/verifier_raw_tp_writable.c | 50 + + .../testing/selftests/bpf/progs/verifier_ringbuf.c | 131 ++ + .../selftests/bpf/progs/verifier_spill_fill.c | 374 ++++ + .../selftests/bpf/progs/verifier_stack_ptr.c | 484 ++++ + .../testing/selftests/bpf/progs/verifier_uninit.c | 61 + + tools/testing/selftests/bpf/progs/verifier_value.c | 158 ++ + .../selftests/bpf/progs/verifier_value_adj_spill.c | 78 + + .../selftests/bpf/progs/verifier_value_or_null.c | 288 +++ + .../testing/selftests/bpf/progs/verifier_var_off.c | 349 +++ + tools/testing/selftests/bpf/progs/verifier_xadd.c | 124 ++ + tools/testing/selftests/bpf/progs/verifier_xdp.c | 24 + + .../bpf/progs/verifier_xdp_direct_packet_access.c | 1722 +++++++++++++++ + tools/testing/selftests/bpf/progs/xdp_features.c | 1 - + tools/testing/selftests/bpf/progs/xdping_kern.c | 2 - + tools/testing/selftests/bpf/progs/xdpwall.c | 1 - + tools/testing/selftests/bpf/progs/xsk_xdp_progs.c | 25 + + tools/testing/selftests/bpf/test_ftrace.sh | 7 +- + tools/testing/selftests/bpf/test_loader.c | 553 ++++- + tools/testing/selftests/bpf/test_progs.c | 108 +- + tools/testing/selftests/bpf/test_progs.h | 18 +- + tools/testing/selftests/bpf/test_tcp_hdr_options.h | 1 + + tools/testing/selftests/bpf/test_tunnel.sh | 13 +- + tools/testing/selftests/bpf/test_verifier.c | 49 +- + tools/testing/selftests/bpf/test_verifier_log.c | 175 -- + tools/testing/selftests/bpf/test_xsk.sh | 1 + + tools/testing/selftests/bpf/testing_helpers.c | 22 +- + tools/testing/selftests/bpf/testing_helpers.h | 2 + + tools/testing/selftests/bpf/trace_helpers.c | 90 +- + tools/testing/selftests/bpf/trace_helpers.h | 5 + + tools/testing/selftests/bpf/unpriv_helpers.c | 26 + + tools/testing/selftests/bpf/unpriv_helpers.h | 7 + + tools/testing/selftests/bpf/verifier/and.c | 68 - + .../testing/selftests/bpf/verifier/array_access.c | 379 ---- + tools/testing/selftests/bpf/verifier/basic_stack.c | 64 - + tools/testing/selftests/bpf/verifier/bounds.c | 129 ++ + .../selftests/bpf/verifier/bounds_deduction.c | 136 -- + .../bpf/verifier/bounds_mix_sign_unsign.c | 411 ---- + .../selftests/bpf/verifier/btf_ctx_access.c | 13 + + tools/testing/selftests/bpf/verifier/calls.c | 14 +- + tools/testing/selftests/bpf/verifier/cfg.c | 73 - + .../selftests/bpf/verifier/cgroup_inv_retcode.c | 72 - + tools/testing/selftests/bpf/verifier/cgroup_skb.c | 197 -- + .../selftests/bpf/verifier/cgroup_storage.c | 220 -- + tools/testing/selftests/bpf/verifier/const_or.c | 60 - + tools/testing/selftests/bpf/verifier/ctx.c | 11 - + tools/testing/selftests/bpf/verifier/ctx_sk_msg.c | 181 -- + .../bpf/verifier/direct_stack_access_wraparound.c | 40 - + tools/testing/selftests/bpf/verifier/div0.c | 184 -- + .../testing/selftests/bpf/verifier/div_overflow.c | 110 - + .../selftests/bpf/verifier/helper_access_var_len.c | 650 ------ + .../selftests/bpf/verifier/helper_packet_access.c | 460 ---- + .../selftests/bpf/verifier/helper_restricted.c | 196 -- + .../selftests/bpf/verifier/helper_value_access.c | 953 -------- + tools/testing/selftests/bpf/verifier/int_ptr.c | 161 -- + tools/testing/selftests/bpf/verifier/ld_ind.c | 72 - + tools/testing/selftests/bpf/verifier/leak_ptr.c | 67 - + tools/testing/selftests/bpf/verifier/map_kptr.c | 2 +- + tools/testing/selftests/bpf/verifier/map_ptr.c | 99 - + tools/testing/selftests/bpf/verifier/map_ret_val.c | 65 - + tools/testing/selftests/bpf/verifier/masking.c | 322 --- + tools/testing/selftests/bpf/verifier/meta_access.c | 235 -- + tools/testing/selftests/bpf/verifier/raw_stack.c | 305 --- + .../selftests/bpf/verifier/raw_tp_writable.c | 35 - + .../testing/selftests/bpf/verifier/ref_tracking.c | 6 +- + tools/testing/selftests/bpf/verifier/ringbuf.c | 95 - + tools/testing/selftests/bpf/verifier/spill_fill.c | 345 --- + tools/testing/selftests/bpf/verifier/stack_ptr.c | 359 --- + tools/testing/selftests/bpf/verifier/uninit.c | 39 - + tools/testing/selftests/bpf/verifier/unpriv.c | 23 + + tools/testing/selftests/bpf/verifier/value.c | 104 - + .../selftests/bpf/verifier/value_adj_spill.c | 43 - + .../testing/selftests/bpf/verifier/value_or_null.c | 220 -- + tools/testing/selftests/bpf/verifier/var_off.c | 291 --- + tools/testing/selftests/bpf/verifier/xadd.c | 97 - + tools/testing/selftests/bpf/verifier/xdp.c | 14 - + .../bpf/verifier/xdp_direct_packet_access.c | 1468 ------------- + tools/testing/selftests/bpf/veristat.c | 207 +- + tools/testing/selftests/bpf/xdp_features.c | 67 +- + tools/testing/selftests/bpf/xsk_xdp_metadata.h | 5 + + tools/testing/selftests/bpf/xskxceiver.c | 96 +- + tools/testing/selftests/bpf/xskxceiver.h | 4 +- + tools/testing/selftests/net/Makefile | 4 +- + tools/testing/selftests/net/big_tcp.sh | 180 ++ + tools/testing/selftests/net/config | 1 + + tools/testing/selftests/net/forwarding/Makefile | 1 + + .../selftests/net/forwarding/hw_stats_l3.sh | 15 +- + .../selftests/net/forwarding/tc_tunnel_key.sh | 161 ++ + tools/testing/selftests/net/mptcp/mptcp_join.sh | 47 +- + tools/testing/selftests/net/rtnetlink.sh | 161 +- + tools/testing/selftests/net/tcp_mmap.c | 102 +- + tools/testing/selftests/net/test_vxlan_mdb.sh | 2318 ++++++++++++++++++++ + tools/testing/selftests/net/tls.c | 45 + + .../creating-testcases/AddingTestCases.txt | 2 + + .../tc-testing/tc-tests/actions/tunnel_key.json | 25 + + .../tc-testing/tc-tests/infra/actions.json | 416 ++++ + tools/testing/selftests/tc-testing/tdc.py | 13 + + tools/testing/vsock/.gitignore | 1 + + tools/testing/vsock/vsock_test.c | 4 +- + 1444 files changed, 81192 insertions(+), 32993 deletions(-) + create mode 100644 Documentation/bpf/libbpf/libbpf_overview.rst + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt + create mode 100644 Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml + create mode 100644 Documentation/devicetree/bindings/net/pcs/mediatek,sgmiisys.yaml + delete mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.txt + create mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.yaml + create mode 100644 Documentation/netlink/specs/devlink.yaml + create mode 100644 Documentation/netlink/specs/ovs_datapath.yaml + create mode 100644 Documentation/netlink/specs/ovs_vport.yaml + delete mode 100644 Documentation/networking/device_drivers/ethernet/intel/ixgb.rst + create mode 100644 Documentation/networking/napi.rst + create mode 100644 drivers/net/can/bxcan.c + create mode 100644 drivers/net/dsa/mt7530-mdio.c + create mode 100644 drivers/net/dsa/mt7530-mmio.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/Makefile + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ee.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ee.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_hw.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_hw.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_ids.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_main.c + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_osdep.h + delete mode 100644 drivers/net/ethernet/intel/ixgb/ixgb_param.c + delete mode 100644 drivers/net/ethernet/mediatek/mtk_sgmii.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_mcast.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ptrn.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/thermal.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/thermal.h + create mode 100644 drivers/net/ipa/data/ipa_data-v5.0.c + create mode 100644 drivers/net/ipa/reg/gsi_reg-v5.0.c + create mode 100644 drivers/net/ipa/reg/ipa_reg-v5.0.c + create mode 100644 drivers/net/pcs/pcs-mtk-lynxi.c + create mode 100644 drivers/net/vxlan/vxlan_mdb.c + create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/link.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/ptp.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h + create mode 100644 drivers/net/wireless/legacy/Kconfig + create mode 100644 drivers/net/wireless/legacy/Makefile + rename drivers/net/wireless/{ => legacy}/ray_cs.c (100%) + rename drivers/net/wireless/{ => legacy}/ray_cs.h (100%) + rename drivers/net/wireless/{ => legacy}/rayctl.h (100%) + rename drivers/net/wireless/{ => legacy}/rndis_wlan.c (99%) + rename drivers/net/wireless/{ => legacy}/wl3501.h (100%) + rename drivers/net/wireless/{ => legacy}/wl3501_cs.c (100%) + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c + create mode 100644 drivers/net/wireless/virtual/Kconfig + create mode 100644 drivers/net/wireless/virtual/Makefile + rename drivers/net/wireless/{ => virtual}/mac80211_hwsim.c (86%) + rename drivers/net/wireless/{ => virtual}/mac80211_hwsim.h (80%) + rename drivers/net/wireless/{ => virtual}/virt_wifi.c (100%) + create mode 100644 drivers/ptp/ptp_dfl_tod.c + create mode 100644 include/linux/net_tstamp.h + create mode 100644 include/linux/pcs/pcs-mtk-lynxi.h + delete mode 100644 include/linux/platform_data/nfcmrvl.h + create mode 100644 include/linux/rcuref.h + create mode 100644 include/net/dsa_stubs.h + create mode 100644 include/net/netdev_queues.h + create mode 100644 kernel/bpf/log.c + create mode 100644 lib/rcuref.c + create mode 100644 net/dsa/stubs.c + create mode 100644 net/dsa/trace.c + create mode 100644 net/dsa/trace.h + create mode 100644 net/ipv4/fou_bpf.c + create mode 100644 net/sctp/stream_sched_fc.c + create mode 100644 net/vmw_vsock/vsock_bpf.c + delete mode 100644 tools/arch/arm64/include/uapi/asm/bpf_perf_event.h + delete mode 100644 tools/arch/s390/include/uapi/asm/bpf_perf_event.h + delete mode 100644 tools/arch/s390/include/uapi/asm/ptrace.h + create mode 100644 tools/lib/bpf/zip.c + create mode 100644 tools/lib/bpf/zip.h + create mode 100755 tools/net/ynl/ethtool.py + create mode 100644 tools/net/ynl/requirements.txt + create mode 100644 tools/testing/selftests/bpf/autoconf_helper.h + create mode 100644 tools/testing/selftests/bpf/benchs/bench_local_storage_create.c + create mode 100644 tools/testing/selftests/bpf/bpf_kfuncs.h + create mode 120000 tools/testing/selftests/bpf/disasm.c + create mode 120000 tools/testing/selftests/bpf/disasm.h + create mode 120000 tools/testing/selftests/bpf/json_writer.c + create mode 120000 tools/testing/selftests/bpf/json_writer.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/ctx_rewrite.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/iters.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/local_kptr_stash.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/map_ops.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/parse_tcp_hdr_opt.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/verifier.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/verifier_log.c + create mode 100644 tools/testing/selftests/bpf/progs/bench_local_storage_create.c + create mode 100644 tools/testing/selftests/bpf/progs/err.h + create mode 100644 tools/testing/selftests/bpf/progs/iters.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_looping.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_num.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_state_safety.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_testmod_seq.c + create mode 100644 tools/testing/selftests/bpf/progs/local_kptr_stash.c + create mode 100644 tools/testing/selftests/bpf/progs/pyperf600_iter.c + create mode 100644 tools/testing/selftests/bpf/progs/rcu_tasks_trace_gp.c + create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_update.c + create mode 100644 tools/testing/selftests/bpf/progs/test_attach_kprobe_sleepable.c + create mode 100644 tools/testing/selftests/bpf/progs/test_attach_probe_manual.c + create mode 100644 tools/testing/selftests/bpf/progs/test_cls_redirect_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_l4lb_noinline_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_map_ops.c + create mode 100644 tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_parse_tcp_hdr_opt_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_dynptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_and.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_array_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_basic_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds_deduction.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds_deduction_non_const.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds_mix_sign_unsign.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_cfg.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_cgroup_inv_retcode.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_cgroup_skb.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_cgroup_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_const_or.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ctx_sk_msg.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_direct_stack_access_wraparound.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_div0.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_div_overflow.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_helper_access_var_len.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_helper_packet_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_helper_restricted.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_helper_value_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_int_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ld_ind.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_leak_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_ret_val.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_masking.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_meta_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_raw_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_raw_tp_writable.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ringbuf.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_spill_fill.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_stack_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_uninit.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_value.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_adj_spill.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_value_or_null.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_var_off.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_xadd.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_xdp.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_xdp_direct_packet_access.c + delete mode 100644 tools/testing/selftests/bpf/test_verifier_log.c + create mode 100644 tools/testing/selftests/bpf/unpriv_helpers.c + create mode 100644 tools/testing/selftests/bpf/unpriv_helpers.h + delete mode 100644 tools/testing/selftests/bpf/verifier/and.c + delete mode 100644 tools/testing/selftests/bpf/verifier/array_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/basic_stack.c + delete mode 100644 tools/testing/selftests/bpf/verifier/bounds_deduction.c + delete mode 100644 tools/testing/selftests/bpf/verifier/bounds_mix_sign_unsign.c + delete mode 100644 tools/testing/selftests/bpf/verifier/cfg.c + delete mode 100644 tools/testing/selftests/bpf/verifier/cgroup_inv_retcode.c + delete mode 100644 tools/testing/selftests/bpf/verifier/cgroup_skb.c + delete mode 100644 tools/testing/selftests/bpf/verifier/cgroup_storage.c + delete mode 100644 tools/testing/selftests/bpf/verifier/const_or.c + delete mode 100644 tools/testing/selftests/bpf/verifier/ctx_sk_msg.c + delete mode 100644 tools/testing/selftests/bpf/verifier/direct_stack_access_wraparound.c + delete mode 100644 tools/testing/selftests/bpf/verifier/div0.c + delete mode 100644 tools/testing/selftests/bpf/verifier/div_overflow.c + delete mode 100644 tools/testing/selftests/bpf/verifier/helper_access_var_len.c + delete mode 100644 tools/testing/selftests/bpf/verifier/helper_packet_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/helper_restricted.c + delete mode 100644 tools/testing/selftests/bpf/verifier/helper_value_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/int_ptr.c + delete mode 100644 tools/testing/selftests/bpf/verifier/ld_ind.c + delete mode 100644 tools/testing/selftests/bpf/verifier/leak_ptr.c + delete mode 100644 tools/testing/selftests/bpf/verifier/map_ptr.c + delete mode 100644 tools/testing/selftests/bpf/verifier/map_ret_val.c + delete mode 100644 tools/testing/selftests/bpf/verifier/masking.c + delete mode 100644 tools/testing/selftests/bpf/verifier/meta_access.c + delete mode 100644 tools/testing/selftests/bpf/verifier/raw_stack.c + delete mode 100644 tools/testing/selftests/bpf/verifier/raw_tp_writable.c + delete mode 100644 tools/testing/selftests/bpf/verifier/ringbuf.c + delete mode 100644 tools/testing/selftests/bpf/verifier/spill_fill.c + delete mode 100644 tools/testing/selftests/bpf/verifier/stack_ptr.c + delete mode 100644 tools/testing/selftests/bpf/verifier/uninit.c + delete mode 100644 tools/testing/selftests/bpf/verifier/value.c + delete mode 100644 tools/testing/selftests/bpf/verifier/value_adj_spill.c + delete mode 100644 tools/testing/selftests/bpf/verifier/value_or_null.c + delete mode 100644 tools/testing/selftests/bpf/verifier/var_off.c + delete mode 100644 tools/testing/selftests/bpf/verifier/xadd.c + delete mode 100644 tools/testing/selftests/bpf/verifier/xdp.c + delete mode 100644 tools/testing/selftests/bpf/verifier/xdp_direct_packet_access.c + create mode 100644 tools/testing/selftests/bpf/xsk_xdp_metadata.h + create mode 100755 tools/testing/selftests/net/big_tcp.sh + create mode 100755 tools/testing/selftests/net/forwarding/tc_tunnel_key.sh + create mode 100755 tools/testing/selftests/net/test_vxlan_mdb.sh + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/infra/actions.json +Merging bpf-next/for-next (4a1e885c6d143 samples/bpf: sampleip: Replace PAGE_OFFSET with _text address) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Merge made by the 'recursive' strategy. + arch/s390/net/bpf_jit_comp.c | 5 + + include/linux/bpf.h | 10 ++ + include/linux/filter.h | 1 + + kernel/bpf/core.c | 11 ++ + kernel/bpf/verifier.c | 127 ++++++++++++++------- + samples/bpf/sampleip_user.c | 11 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 5 + + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 4 +- + 8 files changed, 130 insertions(+), 44 deletions(-) +$ git am -3 ../patches/0001-bpf-test_run-fix-up-for-bpf-test_run-fix-xdp_frame-m.patch +Applying: bpf, test_run: fix up for "bpf, test_run: fix &xdp_frame misplacement for LIVE_FRAMES" +error: sha1 information is lacking or useless (net/bpf/test_run.c). +error: could not build fake ancestor +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 bpf, test_run: fix up for "bpf, test_run: fix &xdp_frame misplacement for LIVE_FRAMES" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging ipsec-next/master (f4796398f21b9 xfrm: Remove inner/outer modes from output path) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_input.c | 66 ++++++++++++++++++-------------------------------- + net/xfrm/xfrm_output.c | 33 +++++++++---------------- + 2 files changed, 34 insertions(+), 65 deletions(-) +Merging mlx5-next/mlx5-next (77f7eb9f3416a net/mlx5: Introduce other vport query for Q-counters) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (677fb75253313 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/main (4de00f0acc722 gve: Unify duplicate GQ min pkt desc size constants) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (cbcb70b9beeeb Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp}) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_conn.c +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging drivers/bluetooth/btbcm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/bluetooth/nxp,88w8987-bt.yaml | 45 + + .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 17 + + .../devicetree/bindings/net/marvell-bluetooth.yaml | 20 +- + .../devicetree/bindings/net/realtek-bluetooth.yaml | 24 +- + MAINTAINERS | 7 + + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 2 +- + drivers/bluetooth/Kconfig | 14 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/btbcm.c | 47 +- + drivers/bluetooth/btintel.c | 77 +- + drivers/bluetooth/btintel.h | 12 +- + drivers/bluetooth/btmrvl_sdio.c | 2 +- + drivers/bluetooth/btmtkuart.c | 6 +- + drivers/bluetooth/btnxpuart.c | 1336 ++++++++++++++++++++ + drivers/bluetooth/btqca.c | 14 +- + drivers/bluetooth/btqca.h | 10 + + drivers/bluetooth/btrtl.c | 141 ++- + drivers/bluetooth/btrtl.h | 5 + + drivers/bluetooth/btusb.c | 95 +- + drivers/bluetooth/hci_bcm.c | 60 +- + drivers/bluetooth/hci_h5.c | 6 + + drivers/bluetooth/hci_ldisc.c | 8 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_mrvl.c | 90 +- + drivers/bluetooth/hci_qca.c | 67 +- + drivers/bluetooth/hci_vhci.c | 97 ++ + drivers/tty/serdev/core.c | 17 +- + drivers/tty/serdev/serdev-ttyport.c | 16 +- + include/linux/serdev.h | 10 +- + include/net/bluetooth/bluetooth.h | 43 +- + include/net/bluetooth/coredump.h | 116 ++ + include/net/bluetooth/hci.h | 7 + + include/net/bluetooth/hci_core.h | 29 +- + include/net/bluetooth/l2cap.h | 2 +- + include/net/bluetooth/mgmt.h | 80 +- + net/bluetooth/Makefile | 2 + + net/bluetooth/coredump.c | 535 ++++++++ + net/bluetooth/hci_conn.c | 162 +-- + net/bluetooth/hci_core.c | 1 + + net/bluetooth/hci_event.c | 42 +- + net/bluetooth/hci_sync.c | 41 +- + net/bluetooth/iso.c | 125 +- + net/bluetooth/l2cap_core.c | 7 +- + net/bluetooth/mgmt.c | 4 +- + net/bluetooth/msft.c | 36 +- + net/bluetooth/smp.c | 9 +- + 46 files changed, 3170 insertions(+), 319 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml + create mode 100644 drivers/bluetooth/btnxpuart.c + create mode 100644 include/net/bluetooth/coredump.h + create mode 100644 net/bluetooth/coredump.c +Merging wireless-next/for-next (cdc419e9e7f3c wifi: iwlwifi: mvm: tx: remove misleading if statement) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 47 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 41 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 37 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 11 + + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 4 + + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 4 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 6 + + drivers/net/wireless/intel/iwlwifi/iwl-debug.c | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 11 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 21 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 7 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 36 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 22 + + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 25 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 19 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 234 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 18 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 36 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 82 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 42 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 40 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 387 +++--- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 72 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 11 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 10 +- + drivers/net/wireless/mediatek/mt76/tx.c | 2 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 36 + + drivers/net/wireless/realtek/rtw88/Makefile | 12 + + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/mac.c | 53 +- + drivers/net/wireless/realtek/rtw88/mac.h | 1 - + drivers/net/wireless/realtek/rtw88/main.c | 9 +- + drivers/net/wireless/realtek/rtw88/reg.h | 12 + + drivers/net/wireless/realtek/rtw88/rtw8821cs.c | 36 + + drivers/net/wireless/realtek/rtw88/rtw8822bs.c | 36 + + drivers/net/wireless/realtek/rtw88/rtw8822cs.c | 36 + + drivers/net/wireless/realtek/rtw88/sdio.c | 1394 ++++++++++++++++++++ + drivers/net/wireless/realtek/rtw88/sdio.h | 178 +++ + drivers/net/wireless/virtual/mac80211_hwsim.c | 3 + + include/linux/ieee80211.h | 63 +- + include/linux/mmc/sdio_ids.h | 9 + + include/net/mac80211.h | 6 + + net/mac80211/cfg.c | 4 + + net/mac80211/driver-ops.h | 15 + + net/mac80211/sta_info.c | 12 + + net/mac80211/trace.h | 7 + + net/mac80211/tx.c | 4 +- + 59 files changed, 2759 insertions(+), 471 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821cs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822bs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822cs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/sdio.c + create mode 100644 drivers/net/wireless/realtek/rtw88/sdio.h +Merging wpan-next/master (1af3de62f03f6 ieee802154: ca8210: Flag the driver as being limited) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Auto-merging net/ieee802154/nl802154.c +Auto-merging drivers/net/ieee802154/ca8210.c +Merge made by the 'recursive' strategy. + drivers/net/ieee802154/ca8210.c | 3 +- + include/net/cfg802154.h | 3 ++ + include/net/ieee802154_netdev.h | 20 +++++++++++- + net/ieee802154/header_ops.c | 36 +++++++++++++++++++++ + net/ieee802154/nl802154.c | 13 +++++++- + net/mac802154/ieee802154_i.h | 21 +++++++++++++ + net/mac802154/main.c | 2 ++ + net/mac802154/rx.c | 70 ++++++++++++++++++++++++++++++++++++++++- + net/mac802154/scan.c | 68 +++++++++++++++++++++++++++++++++++---- + 9 files changed, 226 insertions(+), 10 deletions(-) +Merging mtd/mtd/next (e6026eb080fa1 mtd: lpddr_cmds: remove unused words variable) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml +Merge made by the 'recursive' strategy. + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 2 +- + .../bindings/mtd/arasan,nand-controller.yaml | 2 +- + .../bindings/mtd/arm,pl353-nand-r2p1.yaml | 2 +- + .../devicetree/bindings/mtd/gpmi-nand.yaml | 2 +- + .../devicetree/bindings/mtd/intel,lgm-ebunand.yaml | 2 +- + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 2 +- + .../devicetree/bindings/mtd/mtd-physmap.yaml | 2 +- + .../devicetree/bindings/mtd/mxc-nand.yaml | 2 +- + .../devicetree/bindings/mtd/nand-chip.yaml | 2 +- + .../devicetree/bindings/mtd/nand-controller.yaml | 2 +- + .../mtd/partitions/brcm,bcm4908-partitions.yaml | 2 +- + .../mtd/partitions/linksys,ns-partitions.yaml | 2 +- + .../devicetree/bindings/mtd/qcom,nandc.yaml | 2 +- + .../devicetree/bindings/mtd/renesas-nandc.yaml | 2 +- + .../bindings/mtd/rockchip,nand-controller.yaml | 2 +- + .../devicetree/bindings/mtd/spi-nand.yaml | 2 +- + .../bindings/mtd/st,stm32-fmc2-nand.yaml | 2 +- + .../devicetree/bindings/mtd/ti,gpmc-nand.yaml | 4 +-- + .../devicetree/bindings/mtd/ti,gpmc-onenand.yaml | 4 +-- + drivers/mtd/devices/spear_smi.c | 4 +-- + drivers/mtd/lpddr/lpddr_cmds.c | 7 ++-- + drivers/mtd/maps/sun_uflash.c | 2 +- + drivers/mtd/mtdblock_ro.c | 4 ++- + drivers/mtd/mtdcore.c | 39 ++++++++++++---------- + drivers/mtd/nand/raw/fsmc_nand.c | 2 +- + drivers/mtd/nand/raw/nand_macronix.c | 5 ++- + drivers/mtd/parsers/bcm63xxpart.c | 1 - + drivers/mtd/spi-nor/controllers/nxp-spifi.c | 4 +-- + 28 files changed, 56 insertions(+), 54 deletions(-) +Merging nand/nand/next (ec185b18c2232 mtd: nand: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging drivers/mtd/nand/raw/stm32_fmc2_nand.c +Auto-merging drivers/mtd/nand/raw/meson_nand.c +Auto-merging drivers/mtd/nand/raw/fsmc_nand.c +Auto-merging drivers/mtd/nand/ecc-mxic.c +Merge made by the 'recursive' strategy. + drivers/mtd/nand/ecc-mxic.c | 6 +- + drivers/mtd/nand/onenand/Kconfig | 2 +- + drivers/mtd/nand/onenand/generic.c | 6 +- + drivers/mtd/nand/onenand/onenand_omap2.c | 6 +- + drivers/mtd/nand/onenand/onenand_samsung.c | 6 +- + drivers/mtd/nand/raw/Kconfig | 2 +- + drivers/mtd/nand/raw/ams-delta.c | 6 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 6 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 6 +- + drivers/mtd/nand/raw/au1550nd.c | 5 +- + drivers/mtd/nand/raw/bcm47xxnflash/main.c | 6 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 6 +- + drivers/mtd/nand/raw/davinci_nand.c | 6 +- + drivers/mtd/nand/raw/denali_dt.c | 6 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 6 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 6 +- + drivers/mtd/nand/raw/fsl_upm.c | 6 +- + drivers/mtd/nand/raw/fsmc_nand.c | 6 +- + drivers/mtd/nand/raw/gpio.c | 6 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 5 +- + drivers/mtd/nand/raw/hisi504_nand.c | 6 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 6 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 6 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 6 +- + drivers/mtd/nand/raw/lpc32xx_slc.c | 6 +- + drivers/mtd/nand/raw/marvell_nand.c | 6 +- + drivers/mtd/nand/raw/meson_nand.c | 6 +- + drivers/mtd/nand/raw/mpc5121_nfc.c | 6 +- + drivers/mtd/nand/raw/mtk_nand.c | 6 +- + drivers/mtd/nand/raw/mxc_nand.c | 16 +-- + drivers/mtd/nand/raw/mxic_nand.c | 5 +- + drivers/mtd/nand/raw/nand_hynix.c | 13 +++ + drivers/mtd/nand/raw/ndfc.c | 6 +- + drivers/mtd/nand/raw/omap2.c | 5 +- + drivers/mtd/nand/raw/omap_elm.c | 5 +- + drivers/mtd/nand/raw/orion_nand.c | 10 +- + drivers/mtd/nand/raw/oxnas_nand.c | 6 +- + drivers/mtd/nand/raw/pasemi_nand.c | 6 +- + drivers/mtd/nand/raw/pl35x-nand-controller.c | 6 +- + drivers/mtd/nand/raw/plat_nand.c | 6 +- + drivers/mtd/nand/raw/qcom_nandc.c | 11 +- + drivers/mtd/nand/raw/renesas-nand-controller.c | 6 +- + drivers/mtd/nand/raw/rockchip-nand-controller.c | 6 +- + drivers/mtd/nand/raw/s3c2410.c | 8 +- + drivers/mtd/nand/raw/sh_flctl.c | 6 +- + drivers/mtd/nand/raw/sharpsl.c | 6 +- + drivers/mtd/nand/raw/socrates_nand.c | 6 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 6 +- + drivers/mtd/nand/raw/sunxi_nand.c | 6 +- + drivers/mtd/nand/raw/tegra_nand.c | 6 +- + drivers/mtd/nand/raw/vf610_nfc.c | 5 +- + drivers/mtd/nand/raw/xway_nand.c | 6 +- + drivers/mtd/nand/spi/Makefile | 3 +- + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/esmt.c | 135 ++++++++++++++++++++++++ + drivers/mtd/parsers/Kconfig | 2 +- + include/linux/mtd/rawnand.h | 2 +- + include/linux/mtd/spinand.h | 1 + + 58 files changed, 258 insertions(+), 212 deletions(-) + create mode 100644 drivers/mtd/nand/spi/esmt.c +Merging spi-nor/spi-nor/next (df6def86b9dcb mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/debugfs.c +Auto-merging drivers/mtd/spi-nor/core.h +Auto-merging drivers/mtd/spi-nor/core.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/mtd/spi-nor.rst | 3 - + drivers/mtd/spi-nor/core.c | 502 +++++++++++++++++++++++++++++-- + drivers/mtd/spi-nor/core.h | 36 ++- + drivers/mtd/spi-nor/debugfs.c | 2 + + drivers/mtd/spi-nor/macronix.c | 11 +- + drivers/mtd/spi-nor/micron-st.c | 36 +-- + drivers/mtd/spi-nor/otp.c | 8 +- + drivers/mtd/spi-nor/sfdp.c | 107 ++++++- + drivers/mtd/spi-nor/sfdp.h | 27 ++ + drivers/mtd/spi-nor/spansion.c | 460 ++++++++++++++++++++++++---- + drivers/mtd/spi-nor/sst.c | 2 +- + drivers/mtd/spi-nor/swp.c | 6 +- + drivers/mtd/spi-nor/winbond.c | 24 +- + drivers/mtd/spi-nor/xilinx.c | 1 + + include/linux/mtd/spi-nor.h | 19 +- + 15 files changed, 1081 insertions(+), 163 deletions(-) +Merging crypto/master (586d492f28562 crypto: ixp4xx - fix building wiht 64-bit dma_addr_t) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging drivers/crypto/ccp/sev-dev.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/arm64/boot/dts/qcom/sm8550.dtsi +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/crypto/qcom-qce.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/qcom-qce.txt | 25 - + .../devicetree/bindings/crypto/qcom-qce.yaml | 123 ++ + MAINTAINERS | 33 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- + arch/arm64/crypto/aes-neonbs-core.S | 9 +- + arch/powerpc/crypto/Kconfig | 17 + + arch/powerpc/crypto/Makefile | 13 + + arch/powerpc/crypto/aes-gcm-p10-glue.c | 344 +++++ + arch/powerpc/crypto/aes-gcm-p10.S | 1521 ++++++++++++++++++++ + arch/powerpc/crypto/aesp8-ppc.pl | 585 ++++++++ + arch/powerpc/crypto/ghashp8-ppc.pl | 370 +++++ + arch/powerpc/crypto/ppc-xlate.pl | 229 +++ + arch/x86/kvm/svm/sev.c | 1 + + crypto/acompress.c | 81 +- + crypto/aead.c | 98 +- + crypto/ahash.c | 93 +- + crypto/akcipher.c | 52 +- + crypto/algapi.c | 219 +-- + crypto/algif_hash.c | 19 +- + crypto/async_tx/async_pq.c | 10 +- + crypto/async_tx/async_tx.c | 4 +- + crypto/compress.h | 26 + + crypto/crypto_user_stat.c | 183 +-- + crypto/drbg.c | 2 +- + crypto/fips.c | 11 +- + crypto/hash.h | 36 + + crypto/internal.h | 2 + + crypto/jitterentropy-kcapi.c | 51 +- + crypto/jitterentropy.c | 144 +- + crypto/jitterentropy.h | 1 - + crypto/kpp.c | 53 +- + crypto/rng.c | 65 +- + crypto/scompress.c | 39 +- + crypto/shash.c | 129 +- + crypto/skcipher.c | 113 +- + crypto/tcrypt.c | 11 +- + crypto/testmgr.c | 266 ++-- + drivers/char/hw_random/meson-rng.c | 29 +- + drivers/char/hw_random/xgene-rng.c | 46 +- + drivers/crypto/Kconfig | 21 +- + drivers/crypto/Makefile | 4 +- + drivers/crypto/amcc/crypto4xx_core.c | 2 +- + drivers/crypto/aspeed/aspeed-acry.c | 14 +- + drivers/crypto/atmel-aes.c | 16 +- + drivers/crypto/atmel-sha.c | 34 +- + drivers/crypto/atmel-sha204a.c | 2 +- + drivers/crypto/atmel-tdes.c | 15 +- + drivers/crypto/caam/caamalg.c | 21 +- + drivers/crypto/caam/caamhash.c | 10 +- + drivers/crypto/caam/caampkc.c | 6 +- + drivers/crypto/caam/caamrng.c | 6 +- + drivers/crypto/caam/ctrl.c | 112 +- + drivers/crypto/caam/debugfs.c | 12 +- + drivers/crypto/caam/debugfs.h | 7 +- + drivers/crypto/caam/dpseci-debugfs.c | 2 +- + drivers/crypto/caam/intern.h | 1 + + drivers/crypto/caam/jr.c | 61 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 1 - + drivers/crypto/ccp/Makefile | 3 +- + drivers/crypto/ccp/platform-access.c | 215 +++ + drivers/crypto/ccp/platform-access.h | 35 + + drivers/crypto/ccp/psp-dev.c | 38 +- + drivers/crypto/ccp/psp-dev.h | 11 +- + drivers/crypto/ccp/sev-dev.c | 16 +- + drivers/crypto/ccp/sev-dev.h | 2 +- + drivers/crypto/ccp/sp-dev.h | 10 + + drivers/crypto/ccp/sp-pci.c | 11 +- + drivers/crypto/ccp/tee-dev.c | 17 +- + drivers/crypto/ccree/cc_driver.c | 4 +- + drivers/crypto/hifn_795x.c | 24 +- + drivers/crypto/hisilicon/Kconfig | 7 + + drivers/crypto/hisilicon/Makefile | 2 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 1 - + drivers/crypto/hisilicon/qm.c | 1 - + drivers/crypto/hisilicon/sec2/sec_main.c | 1 - + drivers/crypto/hisilicon/trng/Makefile | 3 + + drivers/crypto/hisilicon/trng/trng-stb.c | 176 +++ + drivers/crypto/hisilicon/zip/zip_main.c | 1 - + drivers/crypto/img-hash.c | 7 +- + drivers/crypto/inside-secure/safexcel.c | 39 +- + drivers/crypto/intel/Kconfig | 5 + + drivers/crypto/intel/Makefile | 5 + + drivers/crypto/intel/ixp4xx/Kconfig | 14 + + drivers/crypto/intel/ixp4xx/Makefile | 2 + + drivers/crypto/{ => intel/ixp4xx}/ixp4xx_crypto.c | 15 +- + drivers/crypto/{ => intel}/keembay/Kconfig | 0 + drivers/crypto/{ => intel}/keembay/Makefile | 0 + .../{ => intel}/keembay/keembay-ocs-aes-core.c | 2 - + .../crypto/{ => intel}/keembay/keembay-ocs-ecc.c | 0 + .../{ => intel}/keembay/keembay-ocs-hcu-core.c | 0 + drivers/crypto/{ => intel}/keembay/ocs-aes.c | 0 + drivers/crypto/{ => intel}/keembay/ocs-aes.h | 0 + drivers/crypto/{ => intel}/keembay/ocs-hcu.c | 0 + drivers/crypto/{ => intel}/keembay/ocs-hcu.h | 0 + drivers/crypto/{ => intel}/qat/Kconfig | 0 + drivers/crypto/{ => intel}/qat/Makefile | 0 + drivers/crypto/{ => intel}/qat/qat_4xxx/Makefile | 0 + .../{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.c | 62 +- + .../{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.h | 9 +- + drivers/crypto/{ => intel}/qat/qat_4xxx/adf_drv.c | 31 +- + drivers/crypto/{ => intel}/qat/qat_c3xxx/Makefile | 0 + .../{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 2 +- + .../{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 0 + drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_drv.c | 24 +- + .../crypto/{ => intel}/qat/qat_c3xxxvf/Makefile | 0 + .../qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 0 + .../qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h | 0 + .../crypto/{ => intel}/qat/qat_c3xxxvf/adf_drv.c | 13 +- + drivers/crypto/{ => intel}/qat/qat_c62x/Makefile | 0 + .../{ => intel}/qat/qat_c62x/adf_c62x_hw_data.c | 2 +- + .../{ => intel}/qat/qat_c62x/adf_c62x_hw_data.h | 0 + drivers/crypto/{ => intel}/qat/qat_c62x/adf_drv.c | 24 +- + drivers/crypto/{ => intel}/qat/qat_c62xvf/Makefile | 0 + .../qat/qat_c62xvf/adf_c62xvf_hw_data.c | 0 + .../qat/qat_c62xvf/adf_c62xvf_hw_data.h | 0 + .../crypto/{ => intel}/qat/qat_c62xvf/adf_drv.c | 13 +- + drivers/crypto/{ => intel}/qat/qat_common/Makefile | 0 + .../{ => intel}/qat/qat_common/adf_accel_devices.h | 5 +- + .../{ => intel}/qat/qat_common/adf_accel_engine.c | 0 + .../crypto/{ => intel}/qat/qat_common/adf_admin.c | 0 + .../crypto/{ => intel}/qat/qat_common/adf_aer.c | 39 +- + .../crypto/{ => intel}/qat/qat_common/adf_cfg.c | 0 + .../crypto/{ => intel}/qat/qat_common/adf_cfg.h | 0 + .../{ => intel}/qat/qat_common/adf_cfg_common.h | 0 + .../{ => intel}/qat/qat_common/adf_cfg_strings.h | 0 + .../{ => intel}/qat/qat_common/adf_cfg_user.h | 0 + .../{ => intel}/qat/qat_common/adf_common_drv.h | 10 +- + .../{ => intel}/qat/qat_common/adf_ctl_drv.c | 30 +- + .../{ => intel}/qat/qat_common/adf_dev_mgr.c | 2 + + .../{ => intel}/qat/qat_common/adf_gen2_config.c | 0 + .../{ => intel}/qat/qat_common/adf_gen2_config.h | 0 + .../{ => intel}/qat/qat_common/adf_gen2_dc.c | 0 + .../{ => intel}/qat/qat_common/adf_gen2_dc.h | 0 + .../{ => intel}/qat/qat_common/adf_gen2_hw_data.c | 0 + .../{ => intel}/qat/qat_common/adf_gen2_hw_data.h | 0 + .../{ => intel}/qat/qat_common/adf_gen2_pfvf.c | 0 + .../{ => intel}/qat/qat_common/adf_gen2_pfvf.h | 0 + .../{ => intel}/qat/qat_common/adf_gen4_dc.c | 0 + .../{ => intel}/qat/qat_common/adf_gen4_dc.h | 0 + .../{ => intel}/qat/qat_common/adf_gen4_hw_data.c | 0 + .../{ => intel}/qat/qat_common/adf_gen4_hw_data.h | 0 + .../{ => intel}/qat/qat_common/adf_gen4_pfvf.c | 0 + .../{ => intel}/qat/qat_common/adf_gen4_pfvf.h | 0 + .../{ => intel}/qat/qat_common/adf_gen4_pm.c | 0 + .../{ => intel}/qat/qat_common/adf_gen4_pm.h | 0 + .../{ => intel}/qat/qat_common/adf_hw_arbiter.c | 2 +- + .../crypto/{ => intel}/qat/qat_common/adf_init.c | 96 +- + .../crypto/{ => intel}/qat/qat_common/adf_isr.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_msg.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_pf_msg.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_pf_msg.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_pf_proto.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_pf_proto.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_utils.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_utils.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_vf_msg.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_vf_msg.h | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_vf_proto.c | 0 + .../{ => intel}/qat/qat_common/adf_pfvf_vf_proto.h | 0 + .../crypto/{ => intel}/qat/qat_common/adf_sriov.c | 10 +- + .../crypto/{ => intel}/qat/qat_common/adf_sysfs.c | 23 +- + .../{ => intel}/qat/qat_common/adf_transport.c | 0 + .../{ => intel}/qat/qat_common/adf_transport.h | 0 + .../qat/qat_common/adf_transport_access_macros.h | 0 + .../qat/qat_common/adf_transport_debug.c | 0 + .../qat/qat_common/adf_transport_internal.h | 0 + .../crypto/{ => intel}/qat/qat_common/adf_vf_isr.c | 3 +- + .../crypto/{ => intel}/qat/qat_common/icp_qat_fw.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_fw_comp.h | 0 + .../qat/qat_common/icp_qat_fw_init_admin.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_fw_la.h | 0 + .../qat/qat_common/icp_qat_fw_loader_handle.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_fw_pke.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_hal.h | 0 + .../crypto/{ => intel}/qat/qat_common/icp_qat_hw.h | 0 + .../qat/qat_common/icp_qat_hw_20_comp.h | 0 + .../qat/qat_common/icp_qat_hw_20_comp_defs.h | 0 + .../{ => intel}/qat/qat_common/icp_qat_uclo.h | 0 + .../crypto/{ => intel}/qat/qat_common/qat_algs.c | 0 + .../{ => intel}/qat/qat_common/qat_algs_send.c | 0 + .../{ => intel}/qat/qat_common/qat_algs_send.h | 0 + .../{ => intel}/qat/qat_common/qat_asym_algs.c | 0 + drivers/crypto/{ => intel}/qat/qat_common/qat_bl.c | 0 + drivers/crypto/{ => intel}/qat/qat_common/qat_bl.h | 0 + .../{ => intel}/qat/qat_common/qat_comp_algs.c | 0 + .../{ => intel}/qat/qat_common/qat_comp_req.h | 0 + .../{ => intel}/qat/qat_common/qat_compression.c | 0 + .../{ => intel}/qat/qat_common/qat_compression.h | 0 + .../crypto/{ => intel}/qat/qat_common/qat_crypto.c | 0 + .../crypto/{ => intel}/qat/qat_common/qat_crypto.h | 0 + .../crypto/{ => intel}/qat/qat_common/qat_hal.c | 1 + + .../crypto/{ => intel}/qat/qat_common/qat_uclo.c | 1 + + .../crypto/{ => intel}/qat/qat_dh895xcc/Makefile | 0 + .../qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 2 +- + .../qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 0 + .../crypto/{ => intel}/qat/qat_dh895xcc/adf_drv.c | 24 +- + .../crypto/{ => intel}/qat/qat_dh895xccvf/Makefile | 0 + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 0 + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h | 0 + .../{ => intel}/qat/qat_dh895xccvf/adf_drv.c | 13 +- + drivers/crypto/mxs-dcp.c | 21 +- + drivers/crypto/qce/core.c | 23 +- + drivers/crypto/qce/core.h | 1 + + drivers/crypto/sa2ul.c | 6 +- + drivers/crypto/sahara.c | 4 +- + drivers/crypto/stm32/stm32-hash.c | 361 ++--- + drivers/i2c/busses/i2c-designware-amdpsp.c | 18 +- + drivers/tee/amdtee/call.c | 2 +- + drivers/tee/amdtee/shm_pool.c | 2 +- + include/crypto/acompress.h | 132 +- + include/crypto/aead.h | 22 + + include/crypto/akcipher.h | 102 +- + include/crypto/algapi.h | 93 +- + include/crypto/hash.h | 89 +- + include/crypto/internal/acompress.h | 43 +- + include/crypto/internal/scompress.h | 15 +- + include/crypto/kpp.h | 73 +- + include/crypto/rng.h | 65 +- + include/crypto/skcipher.h | 22 + + include/crypto/utils.h | 73 + + include/linux/crypto.h | 235 +-- + include/linux/psp-platform-access.h | 64 + + include/linux/psp-sev.h | 8 - + include/linux/psp.h | 29 + + kernel/padata.c | 4 +- + lib/crypto/utils.c | 2 +- + 226 files changed, 5949 insertions(+), 2070 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/crypto/qcom-qce.txt + create mode 100644 Documentation/devicetree/bindings/crypto/qcom-qce.yaml + create mode 100644 arch/powerpc/crypto/aes-gcm-p10-glue.c + create mode 100644 arch/powerpc/crypto/aes-gcm-p10.S + create mode 100644 arch/powerpc/crypto/aesp8-ppc.pl + create mode 100644 arch/powerpc/crypto/ghashp8-ppc.pl + create mode 100644 arch/powerpc/crypto/ppc-xlate.pl + create mode 100644 crypto/compress.h + create mode 100644 crypto/hash.h + create mode 100644 drivers/crypto/ccp/platform-access.c + create mode 100644 drivers/crypto/ccp/platform-access.h + create mode 100644 drivers/crypto/hisilicon/trng/trng-stb.c + create mode 100644 drivers/crypto/intel/Kconfig + create mode 100644 drivers/crypto/intel/Makefile + create mode 100644 drivers/crypto/intel/ixp4xx/Kconfig + create mode 100644 drivers/crypto/intel/ixp4xx/Makefile + rename drivers/crypto/{ => intel/ixp4xx}/ixp4xx_crypto.c (99%) + rename drivers/crypto/{ => intel}/keembay/Kconfig (100%) + rename drivers/crypto/{ => intel}/keembay/Makefile (100%) + rename drivers/crypto/{ => intel}/keembay/keembay-ocs-aes-core.c (99%) + rename drivers/crypto/{ => intel}/keembay/keembay-ocs-ecc.c (100%) + rename drivers/crypto/{ => intel}/keembay/keembay-ocs-hcu-core.c (100%) + rename drivers/crypto/{ => intel}/keembay/ocs-aes.c (100%) + rename drivers/crypto/{ => intel}/keembay/ocs-aes.h (100%) + rename drivers/crypto/{ => intel}/keembay/ocs-hcu.c (100%) + rename drivers/crypto/{ => intel}/keembay/ocs-hcu.h (100%) + rename drivers/crypto/{ => intel}/qat/Kconfig (100%) + rename drivers/crypto/{ => intel}/qat/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_4xxx/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.c (87%) + rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_4xxx_hw_data.h (86%) + rename drivers/crypto/{ => intel}/qat/qat_4xxx/adf_drv.c (95%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxx/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.c (98%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_c3xxx_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxx/adf_drv.c (93%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_c3xxxvf/adf_drv.c (96%) + rename drivers/crypto/{ => intel}/qat/qat_c62x/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.c (98%) + rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_c62x_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62x/adf_drv.c (93%) + rename drivers/crypto/{ => intel}/qat/qat_c62xvf/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_c62xvf_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_c62xvf/adf_drv.c (96%) + rename drivers/crypto/{ => intel}/qat/qat_common/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_devices.h (97%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_accel_engine.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_admin.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_aer.c (82%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_common.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_strings.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_cfg_user.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_common_drv.h (96%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_ctl_drv.c (95%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_dev_mgr.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_config.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_dc.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen2_pfvf.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_dc.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pfvf.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_gen4_pm.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_hw_arbiter.c (98%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_init.c (85%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_isr.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_msg.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_msg.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_pf_proto.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_utils.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_msg.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_pfvf_vf_proto.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_sriov.c (96%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_sysfs.c (88%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_access_macros.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_debug.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_transport_internal.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/adf_vf_isr.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_comp.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_init_admin.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_la.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_loader_handle.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_fw_pke.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hal.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_hw_20_comp_defs.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/icp_qat_uclo.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_algs_send.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_asym_algs.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_bl.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_algs.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_comp_req.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_compression.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_crypto.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_hal.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_common/qat_uclo.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c (99%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xcc/adf_drv.c (93%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/Makefile (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h (100%) + rename drivers/crypto/{ => intel}/qat/qat_dh895xccvf/adf_drv.c (96%) + create mode 100644 include/crypto/utils.h + create mode 100644 include/linux/psp-platform-access.h + create mode 100644 include/linux/psp.h +Merging drm/drm-next (afa351a15d809 Merge tag 'drm-intel-next-fixes-2023-04-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Removing include/drm/i915_mei_hdcp_interface.h +Auto-merging include/drm/gpu_scheduler.h +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_pool.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Removing drivers/gpu/drm/radeon/radeon_fb.c +Removing drivers/gpu/drm/i915/intel_pm.h +Auto-merging drivers/gpu/drm/i915/i915_pmu.c +Auto-merging drivers/gpu/drm/i915/i915_perf_types.h +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_ttm.c +Auto-merging drivers/gpu/drm/i915/display/intel_tc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_tc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dpt.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_color.c +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/icl_dsi.c +Removing drivers/gpu/drm/i915/Kconfig.unstable +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +Removing drivers/gpu/drm/amd/display/dc/dc_link.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/Kconfig +Auto-merging drivers/accel/ivpu/ivpu_pm.c +Auto-merging drivers/accel/ivpu/ivpu_drv.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt +Removing Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt +Removing Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt +Removing Documentation/devicetree/bindings/display/panel/innolux,p120zdg-bf1.yaml +Removing Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt +Removing Documentation/devicetree/bindings/display/bridge/analogix_dp.txt +Resolved 'drivers/gpu/drm/amd/display/Kconfig' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/icl_dsi.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_tc.c' using previous resolution. +Resolved 'drivers/gpu/drm/ttm/ttm_pool.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bb81b5d3cf735] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-i915-hwmon | 4 +- + Documentation/accel/index.rst | 1 + + Documentation/accel/qaic/aic100.rst | 510 + + Documentation/accel/qaic/index.rst | 13 + + Documentation/accel/qaic/qaic.rst | 170 + + .../bindings/auxdisplay/holtek,ht16k33.yaml | 2 +- + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 4 +- + .../bindings/display/amlogic,meson-vpu.yaml | 4 +- + .../bindings/display/bridge/analogix,anx7625.yaml | 4 +- + .../bindings/display/bridge/analogix,dp.yaml | 63 + + .../bindings/display/bridge/analogix_dp.txt | 51 - + .../bindings/display/bridge/cdns,mhdp8546.yaml | 4 +- + .../bindings/display/bridge/nxp,ptn3460.yaml | 2 +- + .../bindings/display/bridge/samsung,mipi-dsim.yaml | 255 + + .../bindings/display/bridge/snps,dw-mipi-dsi.yaml | 16 +- + .../bindings/display/bridge/toshiba,tc358767.yaml | 2 +- + .../devicetree/bindings/display/dp-aux-bus.yaml | 2 +- + .../bindings/display/dsi-controller.yaml | 18 +- + .../bindings/display/exynos/exynos_dp.txt | 2 +- + .../bindings/display/exynos/exynos_dsim.txt | 90 - + .../bindings/display/imx/fsl,imx-lcdc.yaml | 46 +- + .../bindings/display/imx/nxp,imx8mq-dcss.yaml | 4 +- + .../bindings/display/mediatek/mediatek,ccorr.yaml | 5 +- + .../bindings/display/mediatek/mediatek,ethdr.yaml | 182 + + .../bindings/display/mediatek/mediatek,hdmi.yaml | 2 +- + .../bindings/display/msm/dp-controller.yaml | 25 +- + .../bindings/display/msm/dsi-controller-main.yaml | 17 +- + .../bindings/display/msm/dsi-phy-10nm.yaml | 2 +- + .../devicetree/bindings/display/msm/gmu.yaml | 4 +- + .../devicetree/bindings/display/msm/gpu.yaml | 4 +- + .../devicetree/bindings/display/msm/mdp4.yaml | 4 +- + .../bindings/display/msm/qcom,sm6115-mdss.yaml | 10 +- + .../bindings/display/msm/qcom,sm8450-mdss.yaml | 6 +- + .../bindings/display/msm/qcom,sm8550-dpu.yaml | 133 + + .../bindings/display/msm/qcom,sm8550-mdss.yaml | 333 + + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 3 + + .../bindings/display/panel/elida,kd35t133.yaml | 9 + + .../display/panel/feiyang,fy07024di26a30d.yaml | 8 + + .../display/panel/innolux,p120zdg-bf1.yaml | 43 - + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 2 + + .../bindings/display/panel/novatek,nt36523.yaml | 85 + + .../bindings/display/panel/novatek,nt36672a.yaml | 6 +- + .../bindings/display/panel/panel-simple-dsi.yaml | 24 +- + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/panel-timing.yaml | 46 +- + .../bindings/display/panel/ronbo,rb070d30.yaml | 2 +- + .../bindings/display/panel/samsung,ams495qa01.yaml | 57 + + .../display/panel/samsung,s6e88a0-ams452ef01.yaml | 8 + + .../bindings/display/panel/seiko,43wvf1g.yaml | 4 +- + .../bindings/display/panel/sitronix,st7701.yaml | 10 + + .../bindings/display/panel/sitronix,st7789v.yaml | 4 + + .../bindings/display/panel/sony,td4353-jdi.yaml | 82 + + .../bindings/display/panel/visionox,rm69299.yaml | 25 +- + .../bindings/display/panel/xinpeng,xpp055c272.yaml | 8 + + .../devicetree/bindings/display/renesas,du.yaml | 4 +- + .../display/rockchip/analogix_dp-rockchip.txt | 98 - + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 94 - + .../display/rockchip/rockchip,analogix-dp.yaml | 103 + + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 166 + + .../bindings/display/rockchip/rockchip,lvds.yaml | 170 + + .../bindings/display/rockchip/rockchip-lvds.txt | 92 - + .../bindings/display/simple-framebuffer.yaml | 9 + + .../display/tegra/nvidia,tegra114-mipi.yaml | 2 +- + .../display/tegra/nvidia,tegra124-sor.yaml | 12 +- + .../bindings/display/tegra/nvidia,tegra186-dc.yaml | 4 +- + .../display/tegra/nvidia,tegra186-dsi-padctl.yaml | 2 +- + .../bindings/display/tegra/nvidia,tegra20-dsi.yaml | 12 +- + .../display/tegra/nvidia,tegra20-hdmi.yaml | 6 +- + .../bindings/display/ti/ti,am65x-dss.yaml | 6 +- + .../bindings/display/ti/ti,j721e-dss.yaml | 4 +- + .../devicetree/bindings/display/ti/ti,k2g-dss.yaml | 4 +- + .../bindings/display/xylon,logicvc-display.yaml | 22 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 87 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 10 +- + Documentation/driver-api/dma-buf.rst | 16 +- + .../gpu/amdgpu/display/display-manager.rst | 2 +- + MAINTAINERS | 32 +- + drivers/accel/Kconfig | 1 + + drivers/accel/Makefile | 1 + + drivers/accel/habanalabs/common/command_buffer.c | 15 +- + .../accel/habanalabs/common/command_submission.c | 130 +- + drivers/accel/habanalabs/common/debugfs.c | 142 +- + drivers/accel/habanalabs/common/decoder.c | 46 +- + drivers/accel/habanalabs/common/device.c | 367 +- + drivers/accel/habanalabs/common/firmware_if.c | 19 +- + drivers/accel/habanalabs/common/habanalabs.h | 139 +- + drivers/accel/habanalabs/common/habanalabs_drv.c | 14 +- + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 60 +- + drivers/accel/habanalabs/common/irq.c | 84 +- + drivers/accel/habanalabs/common/memory.c | 144 +- + drivers/accel/habanalabs/common/memory_mgr.c | 15 +- + drivers/accel/habanalabs/common/mmu/mmu.c | 14 +- + drivers/accel/habanalabs/common/pci/pci.c | 2 - + drivers/accel/habanalabs/common/security.c | 6 +- + drivers/accel/habanalabs/common/security.h | 2 +- + drivers/accel/habanalabs/common/sysfs.c | 6 +- + drivers/accel/habanalabs/gaudi/gaudi.c | 151 +- + drivers/accel/habanalabs/gaudi/gaudiP.h | 15 - + drivers/accel/habanalabs/gaudi2/gaudi2.c | 1884 +- + drivers/accel/habanalabs/gaudi2/gaudi2P.h | 26 +- + drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c | 2 +- + drivers/accel/habanalabs/gaudi2/gaudi2_masks.h | 3 +- + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 1 + + drivers/accel/habanalabs/goya/goya.c | 22 +- + drivers/accel/habanalabs/include/common/cpucp_if.h | 9 +- + .../accel/habanalabs/include/common/hl_boot_if.h | 47 +- + .../include/gaudi2/asic_reg/gaudi2_regs.h | 9 +- + drivers/accel/habanalabs/include/gaudi2/gaudi2.h | 2 + + .../include/gaudi2/gaudi2_async_events.h | 4 +- + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 5294 +-- + .../accel/habanalabs/include/gaudi2/gaudi2_fw_if.h | 5 +- + drivers/accel/ivpu/ivpu_drv.c | 4 + + drivers/accel/ivpu/ivpu_pm.c | 10 - + drivers/accel/qaic/Kconfig | 23 + + drivers/accel/qaic/Makefile | 13 + + drivers/accel/qaic/mhi_controller.c | 563 + + drivers/accel/qaic/mhi_controller.h | 16 + + drivers/accel/qaic/mhi_qaic_ctrl.c | 569 + + drivers/accel/qaic/mhi_qaic_ctrl.h | 12 + + drivers/accel/qaic/qaic.h | 282 + + drivers/accel/qaic/qaic_control.c | 1526 + + drivers/accel/qaic/qaic_data.c | 1902 + + drivers/accel/qaic/qaic_drv.c | 647 + + drivers/dma-buf/dma-buf.c | 2 +- + drivers/dma-buf/dma-fence-array.c | 11 + + drivers/dma-buf/dma-fence-chain.c | 12 + + drivers/dma-buf/dma-fence.c | 59 + + drivers/dma-buf/dma-resv.c | 22 + + drivers/gpu/drm/Kconfig | 6 +- + drivers/gpu/drm/Makefile | 4 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 2 + + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 48 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 72 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 46 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 23 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 324 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 471 + + .../dc/core/dc_link.c => amdgpu/gfxhub_v1_2.h} | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 83 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 6 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 168 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 44 +- + drivers/gpu/drm/amd/amdgpu/mca_v3_0.h | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 477 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.h | 28 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h | 5 + + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 79 + + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 369 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.h | 32 + + drivers/gpu/drm/amd/amdgpu/nv.c | 73 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 1967 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 76 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 87 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 15 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 20 - + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 487 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 52 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 55 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 15 + + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 +- + drivers/gpu/drm/amd/display/Kconfig | 12 +- + drivers/gpu/drm/amd/display/Makefile | 4 - + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 351 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 5 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 26 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 14 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 33 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 15 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 39 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 149 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 12 +- + drivers/gpu/drm/amd/display/dc/Makefile | 7 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 16 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 5 + + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 5 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 79 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.h | 3 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 405 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 38 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 2 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 415 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 21 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 28 +- + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 2 - + drivers/gpu/drm/amd/display/dc/dc.h | 602 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 57 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 190 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 1 - + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 16 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 577 - + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 117 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 28 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 5 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 5 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 62 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 2 - + .../drm/amd/display/dc/dce110/dce110_resource.c | 3 - + drivers/gpu/drm/amd/display/dc/dce60/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 4 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 4 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.c | 5 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dwb.h | 4 - + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 24 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 29 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 6 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 45 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_mmhubbub.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 13 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 7 - + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_mpc.c | 2 +- + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 2 - + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 4 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 15 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 13 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 4 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 11 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 41 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 13 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 5 +- + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 1 - + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 16 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 - + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 23 + + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 8 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 12 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.h | 2 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 1 + + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 3 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 2 - + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 22 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.h | 39 +- + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 20 +- + .../display/dc/dcn32/dcn32_dio_stream_encoder.h | 72 +- + .../display/dc/dcn32/dcn32_hpo_dp_link_encoder.c | 1 - + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 62 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 10 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 170 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 9 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h | 13 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 71 - + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 18 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 3 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 47 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 13 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 7 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 57 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 3 - + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 3 - + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 299 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 2 - + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 + + .../display/dc/dml/dcn314/display_mode_vba_314.c | 299 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 12 - + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 40 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 7 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 6 +- + .../dc/dml/dcn32/display_mode_vba_util_32.h | 3 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 5 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 86 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc.c | 2 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 25 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 54 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 14 - + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 52 - + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 - + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 +- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/link.h | 354 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 +- + drivers/gpu/drm/amd/display/dc/link/Makefile | 2 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 65 +- + .../amd/display/dc/link/accessories/link_dp_cts.h | 19 +- + .../display/dc/link/accessories/link_dp_trace.c | 21 +- + .../display/dc/link/accessories/link_dp_trace.h | 17 +- + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 22 +- + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 8 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 132 +- + .../gpu/drm/amd/display/dc/link/link_detection.h | 15 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 92 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.h | 23 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 275 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.h | 2 + + .../gpu/drm/amd/display/dc/link/link_resource.h | 3 +- + .../gpu/drm/amd/display/dc/link/link_validation.c | 81 +- + .../gpu/drm/amd/display/dc/link/link_validation.h | 11 + + .../drm/amd/display/dc/link/protocols/link_ddc.c | 24 +- + .../drm/amd/display/dc/link/protocols/link_ddc.h | 31 + + .../display/dc/link/protocols/link_dp_capability.c | 100 +- + .../display/dc/link/protocols/link_dp_capability.h | 28 + + .../amd/display/dc/link/protocols/link_dp_dpia.c | 3 +- + .../amd/display/dc/link/protocols/link_dp_dpia.h | 4 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 175 +- + .../display/dc/link/protocols/link_dp_dpia_bw.h | 57 +- + .../dc/link/protocols/link_dp_irq_handler.c | 30 +- + .../dc/link/protocols/link_dp_irq_handler.h | 12 +- + .../amd/display/dc/link/protocols/link_dp_phy.c | 10 +- + .../amd/display/dc/link/protocols/link_dp_phy.h | 3 + + .../display/dc/link/protocols/link_dp_training.c | 32 +- + .../display/dc/link/protocols/link_dp_training.h | 3 + + .../dc/link/protocols/link_dp_training_auxless.c | 2 +- + .../dc/link/protocols/link_dp_training_auxless.h | 2 +- + .../dc/link/protocols/link_dp_training_dpia.c | 7 +- + .../dc/link/protocols/link_dp_training_dpia.h | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 56 +- + .../dc/link/protocols/link_edp_panel_control.h | 30 + + .../drm/amd/display/dc/link/protocols/link_hpd.c | 14 +- + .../drm/amd/display/dc/link/protocols/link_hpd.h | 7 + + drivers/gpu/drm/amd/display/dc/os_types.h | 4 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 36 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 1 + + .../drm/amd/display/include/ddc_service_types.h | 13 - + .../include/{hdcp_types.h => hdcp_msg_types.h} | 0 + .../drm/amd/display/include/link_service_types.h | 26 - + .../drm/amd/display/modules/freesync/freesync.c | 12 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.h | 2 - + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 1 + + .../drm/amd/display/modules/power/power_helpers.c | 11 +- + .../include/asic_reg/athub/athub_1_8_0_offset.h | 411 + + .../include/asic_reg/athub/athub_1_8_0_sh_mask.h | 1807 + + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 4 + + .../amd/include/asic_reg/gc/gc_10_1_0_sh_mask.h | 54 + + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 4 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 54 + + .../drm/amd/include/asic_reg/gc/gc_9_4_3_offset.h | 7258 ++++ + .../drm/amd/include/asic_reg/gc/gc_9_4_3_sh_mask.h | 30535 +++++++++++++++ + .../amd/include/asic_reg/hdp/hdp_4_4_2_offset.h | 219 + + .../amd/include/asic_reg/hdp/hdp_4_4_2_sh_mask.h | 663 + + .../include/asic_reg/mmhub/mmhub_1_8_0_offset.h | 3314 ++ + .../include/asic_reg/mmhub/mmhub_1_8_0_sh_mask.h | 22315 +++++++++++ + .../drm/amd/include/asic_reg/mp/mp_13_0_6_offset.h | 456 + + .../amd/include/asic_reg/mp/mp_13_0_6_sh_mask.h | 674 + + .../amd/include/asic_reg/nbio/nbio_7_9_0_offset.h | 10002 +++++ + .../amd/include/asic_reg/nbio/nbio_7_9_0_sh_mask.h | 38900 +++++++++++++++++++ + .../amd/include/asic_reg/oss/osssys_4_4_2_offset.h | 263 + + .../include/asic_reg/oss/osssys_4_4_2_sh_mask.h | 995 + + .../amd/include/asic_reg/sdma/sdma_4_4_2_offset.h | 1109 + + .../amd/include/asic_reg/sdma/sdma_4_4_2_sh_mask.h | 3276 ++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 6 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 28 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 123 + + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 3 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 78 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 12 + + .../pm/swsmu/inc/pmfw_if/smu11_driver_if_vangogh.h | 4 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_6.h | 141 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 212 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 95 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 5 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 25 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 11 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 4 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 2069 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 32 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 4 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 8 +- + drivers/gpu/drm/arm/malidp_drv.c | 9 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 4 +- + drivers/gpu/drm/ast/ast_dp.c | 10 +- + drivers/gpu/drm/ast/ast_dp501.c | 40 +- + drivers/gpu/drm/ast/ast_drv.c | 18 +- + drivers/gpu/drm/ast/ast_drv.h | 84 +- + drivers/gpu/drm/ast/ast_i2c.c | 8 +- + drivers/gpu/drm/ast/ast_main.c | 24 +- + drivers/gpu/drm/ast/ast_mm.c | 4 +- + drivers/gpu/drm/ast/ast_mode.c | 104 +- + drivers/gpu/drm/ast/ast_post.c | 94 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 +- + drivers/gpu/drm/bridge/Kconfig | 14 +- + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7533.c | 25 +- + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 6 +- + drivers/gpu/drm/bridge/display-connector.c | 15 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 109 +- + drivers/gpu/drm/bridge/imx/imx8qm-ldb-drv.c | 6 +- + drivers/gpu/drm/bridge/imx/imx8qxp-ldb-drv.c | 6 +- + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 6 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 8 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 6 +- + drivers/gpu/drm/bridge/ite-it6505.c | 34 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 1 - + drivers/gpu/drm/bridge/lvds-codec.c | 6 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 5 +- + drivers/gpu/drm/bridge/panel.c | 70 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 2 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 67 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 1967 + + drivers/gpu/drm/bridge/sii9234.c | 5 - + drivers/gpu/drm/bridge/simple-bridge.c | 14 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-gp-audio.c | 6 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 8 +- + drivers/gpu/drm/bridge/tc358762.c | 1 + + drivers/gpu/drm/bridge/tc358767.c | 4 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 6 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 8 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 6 +- + drivers/gpu/drm/display/drm_scdc_helper.c | 46 +- + drivers/gpu/drm/drm_atomic.c | 60 + + drivers/gpu/drm/drm_atomic_helper.c | 63 +- + drivers/gpu/drm/drm_connector.c | 28 +- + drivers/gpu/drm/drm_debugfs.c | 4 +- + drivers/gpu/drm/drm_displayid.c | 62 +- + drivers/gpu/drm/drm_drv.c | 26 +- + drivers/gpu/drm/drm_dumb_buffers.c | 5 +- + drivers/gpu/drm/drm_edid.c | 65 +- + drivers/gpu/drm/drm_fb_helper.c | 116 +- + drivers/gpu/drm/drm_fbdev_dma.c | 268 + + drivers/gpu/drm/drm_fbdev_generic.c | 279 +- + drivers/gpu/drm/drm_file.c | 2 +- + drivers/gpu/drm/drm_gem.c | 36 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 65 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 11 + + drivers/gpu/drm/drm_internal.h | 3 - + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/gpu/drm/drm_modes.c | 3 +- + drivers/gpu/drm/drm_of.c | 51 + + drivers/gpu/drm/drm_prime.c | 10 +- + drivers/gpu/drm/drm_probe_helper.c | 5 +- + drivers/gpu/drm/drm_suballoc.c | 457 + + drivers/gpu/drm/drm_vblank.c | 59 +- + drivers/gpu/drm/exynos/Kconfig | 3 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1813 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 4 +- + drivers/gpu/drm/gma500/Makefile | 1 + + drivers/gpu/drm/gma500/fbdev.c | 344 + + drivers/gpu/drm/gma500/framebuffer.c | 341 +- + drivers/gpu/drm/gma500/psb_drv.c | 5 +- + drivers/gpu/drm/gma500/psb_drv.h | 19 +- + drivers/gpu/drm/gma500/psb_irq.c | 11 - + drivers/gpu/drm/i915/Kconfig | 6 - + drivers/gpu/drm/i915/Kconfig.unstable | 21 - + drivers/gpu/drm/i915/Makefile | 18 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 53 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 21 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 94 +- + drivers/gpu/drm/i915/display/hsw_ips.h | 1 + + .../gpu/drm/i915/{intel_pm.c => display/i9xx_wm.c} | 1466 +- + drivers/gpu/drm/i915/display/i9xx_wm.h | 21 + + drivers/gpu/drm/i915/display/icl_dsi.c | 302 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 116 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 92 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 161 +- + drivers/gpu/drm/i915/display/intel_bios.c | 266 +- + drivers/gpu/drm/i915/display/intel_bios.h | 27 +- + drivers/gpu/drm/i915/display/intel_bw.c | 49 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 41 +- + drivers/gpu/drm/i915/display/intel_color.c | 18 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 48 +- + .../gpu/drm/i915/display/intel_combo_phy_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_crt.c | 47 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 5 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 20 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.h | 2 + + drivers/gpu/drm/i915/display/intel_cursor.c | 6 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 303 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 9 +- + drivers/gpu/drm/i915/display/intel_display.c | 823 +- + drivers/gpu/drm/i915/display/intel_display.h | 14 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 38 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 673 +- + .../gpu/drm/i915/display/intel_display_debugfs.h | 6 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 98 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 4 + + .../drm/i915/display/intel_display_power_well.c | 141 +- + .../gpu/drm/i915/display/intel_display_reg_defs.h | 10 +- + drivers/gpu/drm/i915/display/intel_display_rps.c | 81 + + drivers/gpu/drm/i915/display/intel_display_rps.h | 22 + + drivers/gpu/drm/i915/display/intel_display_types.h | 44 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 403 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 44 +- + drivers/gpu/drm/i915/display/intel_dp.c | 176 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 83 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 4 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 84 +- + drivers/gpu/drm/i915/display/intel_dp_aux_regs.h | 84 + + .../gpu/drm/i915/display/intel_dp_link_training.c | 48 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 2 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 52 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 51 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 165 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 25 + + drivers/gpu/drm/i915/display/intel_dpt.h | 2 + + drivers/gpu/drm/i915/display/intel_drrs.c | 16 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 42 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 5 +- + drivers/gpu/drm/i915/display/intel_dsb_regs.h | 67 + + .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 5 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 1 + + drivers/gpu/drm/i915/display/intel_dvo.c | 7 +- + drivers/gpu/drm/i915/display/intel_fb.c | 18 +- + drivers/gpu/drm/i915/display/intel_fb.h | 1 + + drivers/gpu/drm/i915/display/intel_fbdev.c | 8 +- + drivers/gpu/drm/i915/display/intel_fbdev.h | 8 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 158 +- + drivers/gpu/drm/i915/display/intel_fdi_regs.h | 151 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 20 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.h | 3 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 30 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 173 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 831 + + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 26 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 87 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 9 + + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 6 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.h | 4 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 339 +- + drivers/gpu/drm/i915/display/intel_lvds_regs.h | 65 + + drivers/gpu/drm/i915/display/intel_mg_phy_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 60 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 40 +- + drivers/gpu/drm/i915/display/intel_opregion.h | 5 + + drivers/gpu/drm/i915/display/intel_panel.c | 1 + + drivers/gpu/drm/i915/display/intel_pch_display.c | 73 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 10 +- + drivers/gpu/drm/i915/display/intel_pps.c | 16 +- + drivers/gpu/drm/i915/display/intel_pps_regs.h | 78 + + drivers/gpu/drm/i915/display/intel_psr.c | 517 +- + drivers/gpu/drm/i915/display/intel_psr.h | 19 +- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 260 + + drivers/gpu/drm/i915/display/intel_qp_tables.c | 187 +- + drivers/gpu/drm/i915/display/intel_qp_tables.h | 4 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 186 +- + drivers/gpu/drm/i915/display/intel_sprite_uapi.c | 127 + + drivers/gpu/drm/i915/display/intel_sprite_uapi.h | 15 + + drivers/gpu/drm/i915/display/intel_tc.c | 1475 +- + drivers/gpu/drm/i915/display/intel_tc.h | 9 +- + drivers/gpu/drm/i915/display/intel_tv.c | 9 +- + drivers/gpu/drm/i915/display/intel_tv_regs.h | 490 + + drivers/gpu/drm/i915/display/intel_vblank.c | 96 +- + drivers/gpu/drm/i915/display/intel_vblank.h | 2 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 133 +- + drivers/gpu/drm/i915/display/intel_vdsc_regs.h | 489 + + drivers/gpu/drm/i915/display/intel_vrr.c | 10 +- + drivers/gpu/drm/i915/display/intel_wm.c | 408 + + drivers/gpu/drm/i915/display/intel_wm.h | 37 + + .../{intel_pm_types.h => display/intel_wm_types.h} | 8 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 15 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 312 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 7 +- + drivers/gpu/drm/i915/display/skl_watermark_regs.h | 160 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 160 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 22 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 14 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 7 + + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 2 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 19 +- + drivers/gpu/drm/i915/gt/intel_context.h | 15 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 141 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 9 + + drivers/gpu/drm/i915/gt/intel_engine_types.h | 24 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 43 +- + drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 1 + + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 3 + + drivers/gpu/drm/i915/gt/intel_gsc.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 166 +- + drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 1 - + drivers/gpu/drm/i915/gt/intel_gt_print.h | 3 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 19 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 2 + + drivers/gpu/drm/i915/gt/intel_rc6.c | 27 + + drivers/gpu/drm/i915/gt/intel_rc6.h | 2 + + drivers/gpu/drm/i915/gt/intel_rc6_types.h | 2 + + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 27 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 119 +- + drivers/gpu/drm/i915/gt/intel_reset_types.h | 2 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 4 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 31 +- + drivers/gpu/drm/i915/gt/intel_rps_types.h | 2 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 3 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 256 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_llc.c | 1 - + drivers/gpu/drm/i915/gt/selftest_rps.c | 10 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 14 +- + drivers/gpu/drm/i915/gt/selftest_tlb.c | 388 + + drivers/gpu/drm/i915/gt/sysfs_engines.c | 72 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 17 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 9 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 28 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.h | 2 + + .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 109 + + .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h | 61 + + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 56 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 141 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 24 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_print.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 61 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 140 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 44 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 56 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 116 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 42 +- + .../gpu/drm/i915/gt/uc/selftest_guc_hangcheck.c | 23 +- + .../gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c | 11 +- + drivers/gpu/drm/i915/gvt/display.c | 16 +- + drivers/gpu/drm/i915/gvt/edid.c | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 23 +- + drivers/gpu/drm/i915/i915_debugfs.c | 37 +- + drivers/gpu/drm/i915/i915_driver.c | 70 +- + drivers/gpu/drm/i915/i915_drm_client.c | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 22 +- + drivers/gpu/drm/i915/i915_file_private.h | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 18 +- + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 3 + + drivers/gpu/drm/i915/i915_gpu_error.h | 1 + + drivers/gpu/drm/i915/i915_hwmon.c | 77 +- + drivers/gpu/drm/i915/i915_irq.c | 144 +- + drivers/gpu/drm/i915/i915_params.c | 6 + + drivers/gpu/drm/i915/i915_params.h | 2 + + drivers/gpu/drm/i915/i915_pci.c | 4 +- + drivers/gpu/drm/i915/i915_perf.c | 550 +- + drivers/gpu/drm/i915/i915_perf.h | 4 +- + drivers/gpu/drm/i915/i915_perf_oa_regs.h | 78 + + drivers/gpu/drm/i915/i915_perf_types.h | 69 +- + drivers/gpu/drm/i915/i915_pmu.c | 1 - + drivers/gpu/drm/i915/i915_reg.h | 2133 +- + drivers/gpu/drm/i915/i915_reg_defs.h | 31 + + drivers/gpu/drm/i915/i915_request.c | 1 - + drivers/gpu/drm/i915/i915_scatterlist.c | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 1 - + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 7 - + drivers/gpu/drm/i915/i915_vma.c | 3 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 888 + + drivers/gpu/drm/i915/intel_clock_gating.h | 14 + + drivers/gpu/drm/i915/intel_device_info.c | 28 +- + drivers/gpu/drm/i915/intel_device_info.h | 3 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 81 +- + drivers/gpu/drm/i915/intel_pcode.c | 35 +- + drivers/gpu/drm/i915/intel_pm.h | 34 - + drivers/gpu/drm/i915/intel_region_ttm.c | 1 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 + + drivers/gpu/drm/i915/intel_uncore.c | 66 +- + drivers/gpu/drm/i915/intel_wakeref.h | 2 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 65 +- + drivers/gpu/drm/i915/pxp/intel_pxp.h | 2 + + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_42.h | 15 + + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h | 6 + + drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 2 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 6 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 10 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.h | 5 + + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 113 +- + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 3 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 356 - + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_request.c | 134 +- + drivers/gpu/drm/i915/soc/intel_dram.c | 152 + + drivers/gpu/drm/i915/vlv_suspend.c | 4 +- + drivers/gpu/drm/imx/Kconfig | 1 + + drivers/gpu/drm/imx/Makefile | 1 + + drivers/gpu/drm/imx/dcss/dcss-kms.c | 4 +- + drivers/gpu/drm/imx/ipuv3/Kconfig | 2 +- + drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 4 +- + drivers/gpu/drm/imx/lcdc/Kconfig | 7 + + drivers/gpu/drm/imx/lcdc/Makefile | 1 + + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 546 + + drivers/gpu/drm/kmb/kmb_drv.c | 4 +- + drivers/gpu/drm/lima/lima_drv.c | 6 +- + drivers/gpu/drm/lima/lima_gem.c | 12 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 4 +- + drivers/gpu/drm/mcde/mcde_drv.c | 6 +- + drivers/gpu/drm/mediatek/Makefile | 2 + + drivers/gpu/drm/mediatek/mtk_disp_drv.h | 35 + + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 94 + + drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 547 + + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 38 + + drivers/gpu/drm/mediatek/mtk_dp.c | 15 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 89 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 6 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 135 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 78 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 475 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 30 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 24 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 3 +- + drivers/gpu/drm/mediatek/mtk_ethdr.c | 370 + + drivers/gpu/drm/mediatek/mtk_ethdr.h | 25 + + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 24 + + drivers/gpu/drm/meson/meson_drv.c | 4 +- + drivers/gpu/drm/meson/meson_venc.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 3 + + drivers/gpu/drm/mgag200/mgag200_mode.c | 22 +- + drivers/gpu/drm/msm/Kconfig | 2 + + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 54 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 30 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 11 + + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 38 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 11 + + drivers/gpu/drm/msm/adreno/a5xx.xml.h | 44 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 69 +- + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 795 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 64 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 7 + + drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 30 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 183 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 52 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 33 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 174 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 + + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 115 +- + .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 210 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 210 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 237 + + .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 217 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 244 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 156 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 129 + + .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 119 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 226 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 158 + + .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 222 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 234 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 239 + + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 337 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 81 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 7 - + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 8 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 22 + + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 21 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2155 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 106 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 49 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 187 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 115 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 98 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 867 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 40 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 22 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 12 + + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 19 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h | 40 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 5 - + drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h | 40 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 2 +- + drivers/gpu/drm/msm/disp/mdp_common.xml.h | 40 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 3 - + drivers/gpu/drm/msm/dp/dp_aux.c | 90 +- + drivers/gpu/drm/msm/dp/dp_aux.h | 2 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 82 +- + drivers/gpu/drm/msm/dp/dp_catalog.h | 6 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 90 +- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 5 +- + drivers/gpu/drm/msm/dp/dp_display.c | 44 +- + drivers/gpu/drm/msm/dp/dp_display.h | 2 + + drivers/gpu/drm/msm/dp/dp_drm.c | 173 +- + drivers/gpu/drm/msm/dp/dp_drm.h | 9 +- + drivers/gpu/drm/msm/dp/dp_link.c | 36 + + drivers/gpu/drm/msm/dp/dp_panel.c | 22 + + drivers/gpu/drm/msm/dp/dp_panel.h | 6 + + drivers/gpu/drm/msm/dp/dp_reg.h | 27 + + drivers/gpu/drm/msm/dsi/dsi.c | 7 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 41 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 161 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 9 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 14 +- + drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h | 36 +- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 40 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 38 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 62 +- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 40 +- + drivers/gpu/drm/msm/msm_atomic.c | 29 +- + drivers/gpu/drm/msm/msm_debugfs.c | 6 +- + drivers/gpu/drm/msm/msm_drv.c | 109 +- + drivers/gpu/drm/msm/msm_drv.h | 15 +- + drivers/gpu/drm/msm/msm_fbdev.c | 173 +- + drivers/gpu/drm/msm/msm_fence.c | 86 +- + drivers/gpu/drm/msm/msm_fence.h | 23 +- + drivers/gpu/drm/msm/msm_gem.c | 150 +- + drivers/gpu/drm/msm/msm_gem.h | 29 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 37 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 91 +- + drivers/gpu/drm/msm/msm_gpu.c | 8 +- + drivers/gpu/drm/msm/msm_gpu.h | 12 +- + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 2 +- + drivers/gpu/drm/msm/msm_io_utils.c | 1 + + drivers/gpu/drm/msm/msm_iommu.c | 38 +- + drivers/gpu/drm/msm/msm_kms.h | 8 - + drivers/gpu/drm/msm/msm_mdss.c | 198 +- + drivers/gpu/drm/msm/msm_mmu.h | 1 + + drivers/gpu/drm/msm/msm_ringbuffer.c | 8 +- + drivers/gpu/drm/msm/msm_submitqueue.c | 2 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 4 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 3 - + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_led.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/nvfw/acr.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/ga100.c | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 6 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 13 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 3 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 163 +- + drivers/gpu/drm/omapdrm/omap_fbdev.h | 9 +- + drivers/gpu/drm/panel/Kconfig | 31 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 126 + + drivers/gpu/drm/panel/panel-edp.c | 2 + + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 209 +- + .../gpu/drm/panel/panel-magnachip-d53e6ea8966.c | 522 + + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 777 + + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 12 + + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 144 + + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 329 + + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 30 + + drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 48 +- + drivers/gpu/drm/panfrost/panfrost_gpu.c | 8 + + drivers/gpu/drm/pl111/pl111_drv.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 11 + + drivers/gpu/drm/radeon/Kconfig | 1 + + drivers/gpu/drm/radeon/Makefile | 3 +- + drivers/gpu/drm/radeon/radeon.h | 57 +- + drivers/gpu/drm/radeon/radeon_display.c | 4 - + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- + drivers/gpu/drm/radeon/radeon_drv.h | 1 - + drivers/gpu/drm/radeon/radeon_fb.c | 400 - + drivers/gpu/drm/radeon/radeon_fbdev.c | 422 + + drivers/gpu/drm/radeon/radeon_gem.c | 24 + + drivers/gpu/drm/radeon/radeon_ib.c | 12 +- + drivers/gpu/drm/radeon/radeon_kms.c | 18 - + drivers/gpu/drm/radeon/radeon_mode.h | 20 +- + drivers/gpu/drm/radeon/radeon_object.h | 25 +- + drivers/gpu/drm/radeon/radeon_sa.c | 316 +- + drivers/gpu/drm/radeon/radeon_semaphore.c | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 38 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 26 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_lvds.c | 176 +- + drivers/gpu/drm/rcar-du/rcar_lvds.h | 12 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 5 - + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 42 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 16 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 19 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 6 + + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 81 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 5 - + drivers/gpu/drm/rockchip/rockchip_rgb.c | 19 +- + drivers/gpu/drm/rockchip/rockchip_rgb.h | 6 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 18 + + drivers/gpu/drm/scheduler/sched_fence.c | 46 + + drivers/gpu/drm/scheduler/sched_main.c | 31 +- + drivers/gpu/drm/sti/Kconfig | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 4 +- + drivers/gpu/drm/stm/Kconfig | 2 +- + drivers/gpu/drm/stm/drv.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- + drivers/gpu/drm/tegra/Kconfig | 2 +- + drivers/gpu/drm/tegra/Makefile | 2 + + drivers/gpu/drm/tegra/dc.c | 22 +- + drivers/gpu/drm/tegra/dc.h | 2 +- + drivers/gpu/drm/tegra/dpaux.c | 6 +- + drivers/gpu/drm/tegra/drm.c | 23 +- + drivers/gpu/drm/tegra/drm.h | 27 +- + drivers/gpu/drm/tegra/dsi.c | 51 +- + drivers/gpu/drm/tegra/fb.c | 242 +- + drivers/gpu/drm/tegra/fbdev.c | 241 + + drivers/gpu/drm/tegra/gem.c | 1 + + drivers/gpu/drm/tegra/gr2d.c | 14 +- + drivers/gpu/drm/tegra/gr3d.c | 14 +- + drivers/gpu/drm/tegra/hdmi.c | 14 +- + drivers/gpu/drm/tegra/hub.c | 13 +- + drivers/gpu/drm/tegra/nvdec.c | 14 +- + drivers/gpu/drm/tegra/output.c | 3 + + drivers/gpu/drm/tegra/plane.c | 16 +- + drivers/gpu/drm/tegra/rgb.c | 7 +- + drivers/gpu/drm/tegra/sor.c | 59 +- + drivers/gpu/drm/tegra/vic.c | 14 +- + drivers/gpu/drm/tests/drm_format_helper_test.c | 146 +- + drivers/gpu/drm/tests/drm_kunit_helpers.c | 6 - + drivers/gpu/drm/tidss/tidss_dispc.c | 12 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 8 +- + drivers/gpu/drm/tidss/tidss_drv.c | 4 +- + drivers/gpu/drm/tidss/tidss_plane.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- + drivers/gpu/drm/tiny/arcpgu.c | 4 +- + drivers/gpu/drm/tiny/bochs.c | 1 - + drivers/gpu/drm/tiny/cirrus.c | 499 +- + drivers/gpu/drm/tiny/ofdrm.c | 8 +- + drivers/gpu/drm/tiny/simpledrm.c | 33 +- + drivers/gpu/drm/ttm/ttm_bo.c | 36 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 19 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 13 +- + drivers/gpu/drm/ttm/ttm_device.c | 1 - + drivers/gpu/drm/ttm/ttm_pool.c | 111 +- + drivers/gpu/drm/ttm/ttm_resource.c | 1 - + drivers/gpu/drm/tve200/tve200_drv.c | 4 +- + drivers/gpu/drm/v3d/v3d_gem.c | 26 +- + drivers/gpu/drm/vc4/vc4_drv.c | 4 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 +- + drivers/gpu/drm/vc4/vc4_gem.c | 78 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 69 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 1 - + drivers/gpu/drm/vc4/vc4_irq.c | 2 - + drivers/gpu/drm/vc4/vc4_validate.c | 4 +- + drivers/gpu/drm/vgem/vgem_drv.h | 11 - + drivers/gpu/drm/vgem/vgem_fence.c | 1 + + drivers/gpu/drm/virtio/Kconfig | 11 + + drivers/gpu/drm/virtio/virtgpu_display.c | 6 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 + + drivers/gpu/drm/virtio/virtgpu_kms.c | 39 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 4 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 3 +- + drivers/gpu/drm/vkms/vkms_output.c | 15 +- + drivers/gpu/drm/vkms/vkms_plane.c | 10 +- + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 407 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 203 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 53 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 65 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 55 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 247 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 105 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 93 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 295 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 48 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 102 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 45 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 35 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 68 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 246 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 53 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 67 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 323 +- + drivers/gpu/drm/vmwgfx/vmwgfx_streamoutput.c | 20 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 107 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 134 +- + drivers/gpu/drm/vmwgfx/vmwgfx_va.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 150 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 10 +- + drivers/gpu/drm/xlnx/zynqmp_kms.c | 4 +- + drivers/gpu/host1x/Kconfig | 2 +- + drivers/gpu/host1x/bus.c | 6 +- + drivers/gpu/host1x/context.c | 24 +- + drivers/gpu/host1x/mipi.c | 4 +- + drivers/gpu/host1x/syncpt.c | 8 +- + drivers/gpu/ipu-v3/Kconfig | 2 +- + drivers/misc/mei/client.c | 4 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 105 +- + drivers/misc/mei/hdcp/mei_hdcp.h | 354 - + drivers/misc/mei/pci-me.c | 20 +- + drivers/ps3/ps3av.c | 9 +- + drivers/staging/media/tegra-video/csi.c | 8 +- + drivers/staging/media/tegra-video/vi.c | 8 +- + drivers/staging/sm750fb/sm750.c | 16 +- + drivers/video/Kconfig | 3 + + drivers/video/Makefile | 1 + + drivers/video/aperture.c | 8 +- + drivers/video/cmdline.c | 133 + + drivers/video/fbdev/Kconfig | 5 +- + drivers/video/fbdev/aty/radeon_base.c | 10 +- + drivers/video/fbdev/core/Makefile | 3 +- + drivers/video/fbdev/core/fb_cmdline.c | 94 +- + drivers/video/fbdev/core/modedb.c | 8 +- + include/drm/bridge/samsung-dsim.h | 115 + + include/drm/display/drm_dp.h | 3 + + include/drm/display/drm_dp_helper.h | 13 + + include/drm/display/drm_scdc_helper.h | 7 +- + include/drm/drm_atomic.h | 7 + + include/drm/drm_atomic_helper.h | 26 + + include/drm/drm_displayid.h | 12 +- + include/drm/drm_drv.h | 21 - + include/drm/drm_edid.h | 12 +- + include/drm/drm_fb_helper.h | 14 +- + include/drm/drm_fbdev_dma.h | 15 + + include/drm/drm_file.h | 3 +- + include/drm/drm_gem.h | 13 + + include/drm/drm_gem_shmem_helper.h | 30 +- + include/drm/drm_gem_vram_helper.h | 4 +- + include/drm/drm_mode_config.h | 7 - + include/drm/drm_modeset_helper_vtables.h | 29 +- + include/drm/drm_of.h | 12 + + include/drm/drm_suballoc.h | 108 + + include/drm/drm_vblank.h | 1 + + include/drm/gpu_scheduler.h | 23 + + include/drm/i915_hdcp_interface.h | 539 + + include/drm/i915_mei_hdcp_interface.h | 184 - + include/drm/i915_pciids.h | 14 +- + include/drm/ttm/ttm_device.h | 2 +- + include/drm/ttm/ttm_tt.h | 10 +- + include/linux/dma-fence.h | 22 + + include/linux/dma-resv.h | 2 + + include/linux/fb.h | 1 - + include/linux/host1x.h | 2 +- + include/uapi/drm/drm.h | 57 +- + include/uapi/drm/habanalabs_accel.h | 105 +- + include/uapi/drm/i915_drm.h | 25 +- + include/uapi/drm/msm_drm.h | 18 +- + include/uapi/drm/qaic_accel.h | 397 + + include/uapi/linux/kfd_ioctl.h | 14 +- + include/uapi/linux/sync_file.h | 37 +- + include/video/cmdline.h | 20 + + 1143 files changed, 181104 insertions(+), 29718 deletions(-) + create mode 100644 Documentation/accel/qaic/aic100.rst + create mode 100644 Documentation/accel/qaic/index.rst + create mode 100644 Documentation/accel/qaic/qaic.rst + create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix,dp.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/analogix_dp.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ethdr.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8550-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8550-mdss.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/innolux,p120zdg-bf1.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,ams495qa01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,analogix-dp.yaml + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,dw-mipi-dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,lvds.yaml + delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt + create mode 100644 drivers/accel/qaic/Kconfig + create mode 100644 drivers/accel/qaic/Makefile + create mode 100644 drivers/accel/qaic/mhi_controller.c + create mode 100644 drivers/accel/qaic/mhi_controller.h + create mode 100644 drivers/accel/qaic/mhi_qaic_ctrl.c + create mode 100644 drivers/accel/qaic/mhi_qaic_ctrl.h + create mode 100644 drivers/accel/qaic/qaic.h + create mode 100644 drivers/accel/qaic/qaic_control.c + create mode 100644 drivers/accel/qaic/qaic_data.c + create mode 100644 drivers/accel/qaic/qaic_drv.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c + rename drivers/gpu/drm/amd/{display/dc/core/dc_link.c => amdgpu/gfxhub_v1_2.h} (83%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_9.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dc_link.h + rename drivers/gpu/drm/amd/display/include/{hdcp_types.h => hdcp_msg_types.h} (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_8_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_8_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_4_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_8_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_1_8_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_6_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_6_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_9_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_4_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma/sdma_4_4_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_6.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h + create mode 100644 drivers/gpu/drm/bridge/samsung-dsim.c + create mode 100644 drivers/gpu/drm/drm_fbdev_dma.c + create mode 100644 drivers/gpu/drm/drm_suballoc.c + create mode 100644 drivers/gpu/drm/gma500/fbdev.c + delete mode 100644 drivers/gpu/drm/i915/Kconfig.unstable + rename drivers/gpu/drm/i915/{intel_pm.c => display/i9xx_wm.c} (73%) + create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_rps.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_rps.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_aux_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dsb_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_fdi_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.c + create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.h + create mode 100644 drivers/gpu/drm/i915/display/intel_lvds_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pps_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_psr_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_sprite_uapi.c + create mode 100644 drivers/gpu/drm/i915/display/intel_sprite_uapi.h + create mode 100644 drivers/gpu/drm/i915/display/intel_tv_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vdsc_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_wm.c + create mode 100644 drivers/gpu/drm/i915/display/intel_wm.h + rename drivers/gpu/drm/i915/{intel_pm_types.h => display/intel_wm_types.h} (89%) + create mode 100644 drivers/gpu/drm/i915/display/skl_watermark_regs.h + create mode 100644 drivers/gpu/drm/i915/gt/selftest_tlb.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h + create mode 100644 drivers/gpu/drm/i915/intel_clock_gating.c + create mode 100644 drivers/gpu/drm/i915/intel_clock_gating.h + delete mode 100644 drivers/gpu/drm/i915/intel_pm.h + create mode 100644 drivers/gpu/drm/imx/lcdc/Kconfig + create mode 100644 drivers/gpu/drm/imx/lcdc/Makefile + create mode 100644 drivers/gpu/drm/imx/lcdc/imx-lcdc.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h + create mode 100644 drivers/gpu/drm/panel/panel-magnachip-d53e6ea8966.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36523.c + create mode 100644 drivers/gpu/drm/panel/panel-sony-td4353-jdi.c + delete mode 100644 drivers/gpu/drm/radeon/radeon_fb.c + create mode 100644 drivers/gpu/drm/radeon/radeon_fbdev.c + create mode 100644 drivers/gpu/drm/tegra/fbdev.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_bo.h + create mode 100644 drivers/video/cmdline.c + create mode 100644 include/drm/bridge/samsung-dsim.h + create mode 100644 include/drm/drm_fbdev_dma.h + create mode 100644 include/drm/drm_suballoc.h + create mode 100644 include/drm/i915_hdcp_interface.h + delete mode 100644 include/drm/i915_mei_hdcp_interface.h + create mode 100644 include/uapi/drm/qaic_accel.h + create mode 100644 include/video/cmdline.h +$ git am -3 ../patches/0001-Revert-drm-ttm-Reduce-the-number-of-used-allocation-.patch +Applying: Revert "drm/ttm: Reduce the number of used allocation orders for TTM pages" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/ttm/ttm_pool.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 012293cddb492] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git + Date: Fri Apr 14 13:53:58 2023 +0100 +Merging drm-misc/for-linux-next (56e51681246e5 drm/ttm: revert "Reduce the number of used allocation orders for TTM pages") +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_pool.c +Removing drivers/accel/qaic/mhi_qaic_ctrl.h +Removing drivers/accel/qaic/mhi_qaic_ctrl.c +Recorded preimage for 'drivers/gpu/drm/ttm/ttm_pool.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/ttm/ttm_pool.c'. +[master 4f2d10a1a46a3] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + drivers/accel/qaic/Makefile | 1 - + drivers/accel/qaic/mhi_qaic_ctrl.c | 569 ------------------------------------- + drivers/accel/qaic/mhi_qaic_ctrl.h | 12 - + drivers/accel/qaic/qaic_drv.c | 10 - + drivers/gpu/drm/ttm/ttm_pool.c | 2 +- + 5 files changed, 1 insertion(+), 593 deletions(-) + delete mode 100644 drivers/accel/qaic/mhi_qaic_ctrl.c + delete mode 100644 drivers/accel/qaic/mhi_qaic_ctrl.h +Merging amdgpu/drm-next (73c4b0f836936 drm/amdgpu: drop temp programming for pagefault handling) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 42 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 72 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 31 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 7 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 40 +++ + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 22 -- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 51 ++- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 41 ++- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 51 ++- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 2 + + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 161 ++++----- + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 197 +++++------ + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 55 ++- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 8 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 7 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 18 + + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 5 +- + drivers/gpu/drm/amd/display/dc/dc.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 20 ++ + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 8 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 18 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 28 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h | 10 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 26 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 3 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 4 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 156 +++++++++ + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 3 + + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 2 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 85 ++++- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 4 + + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 24 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 3 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 8 +- + .../display/dc/link/protocols/link_dp_training.c | 28 +- + .../link_dp_training_fixed_vs_pe_retimer.c | 378 ++++++++++++++++++++- + .../link_dp_training_fixed_vs_pe_retimer.h | 5 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 28 +- + .../drm/amd/display/modules/freesync/freesync.c | 14 - + .../amd/include/asic_reg/oss/osssys_4_2_0_offset.h | 6 + + .../include/asic_reg/oss/osssys_4_2_0_sh_mask.h | 11 + + drivers/gpu/drm/amd/include/v11_structs.h | 16 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 7 - + 68 files changed, 1425 insertions(+), 490 deletions(-) +Merging drm-intel/for-linux-next (81900e3a37750 drm/i915: disable sampler indirect state in bindless heap) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Already up to date. +Merging drm-tegra/for-next (2429b3c529da2 drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (ac7e7c9c65ecf drm/msm/dpu: drop unused macros from hw catalog) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (ac7e7c9c65ecf drm/msm/dpu: drop unused macros from hw catalog) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging imx-drm/imx-drm/next (927d8fd465adb drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (4c22c61e429f0 drm/etnaviv: show number of NN cores in GPU debugfs info) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (b61c2c09c5a3f video: fbdev: xilinxfb: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'recursive' strategy. + drivers/video/fbdev/amba-clcd.c | 24 +++++++++++++----------- + drivers/video/fbdev/arcfb.c | 5 ++--- + drivers/video/fbdev/au1100fb.c | 11 +++-------- + drivers/video/fbdev/au1200fb.c | 6 ++---- + drivers/video/fbdev/broadsheetfb.c | 5 ++--- + drivers/video/fbdev/bw2.c | 6 ++---- + drivers/video/fbdev/cg14.c | 6 ++---- + drivers/video/fbdev/cg3.c | 6 ++---- + drivers/video/fbdev/cg6.c | 6 ++---- + drivers/video/fbdev/clps711x-fb.c | 6 ++---- + drivers/video/fbdev/cobalt_lcdfb.c | 6 ++---- + drivers/video/fbdev/da8xx-fb.c | 6 ++---- + drivers/video/fbdev/efifb.c | 6 ++---- + drivers/video/fbdev/ep93xx-fb.c | 6 ++---- + drivers/video/fbdev/ffb.c | 6 ++---- + drivers/video/fbdev/fsl-diu-fb.c | 6 ++---- + drivers/video/fbdev/gbefb.c | 6 ++---- + drivers/video/fbdev/goldfishfb.c | 5 ++--- + drivers/video/fbdev/grvga.c | 6 ++---- + drivers/video/fbdev/hecubafb.c | 5 ++--- + drivers/video/fbdev/hgafb.c | 6 ++---- + drivers/video/fbdev/hitfb.c | 6 ++---- + drivers/video/fbdev/imxfb.c | 6 ++---- + drivers/video/fbdev/leo.c | 6 ++---- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 5 ++--- + drivers/video/fbdev/metronomefb.c | 5 ++--- + drivers/video/fbdev/mx3fb.c | 5 ++--- + drivers/video/fbdev/ocfb.c | 6 ++---- + drivers/video/fbdev/offb.c | 8 +++----- + drivers/video/fbdev/omap/omapfb_main.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/core.c | 6 ++---- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 5 ++--- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 6 ++---- + drivers/video/fbdev/p9100.c | 6 ++---- + drivers/video/fbdev/platinumfb.c | 6 ++---- + drivers/video/fbdev/pxa168fb.c | 8 +++----- + drivers/video/fbdev/pxa3xx-gcu.c | 6 ++---- + drivers/video/fbdev/pxafb.c | 8 +++----- + drivers/video/fbdev/s1d13xxxfb.c | 5 ++--- + drivers/video/fbdev/s3c-fb.c | 6 ++---- + drivers/video/fbdev/sh7760fb.c | 6 ++---- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 5 ++--- + drivers/video/fbdev/simplefb.c | 6 ++---- + drivers/video/fbdev/sm501fb.c | 6 ++---- + drivers/video/fbdev/tcx.c | 6 ++---- + drivers/video/fbdev/uvesafb.c | 6 ++---- + drivers/video/fbdev/vesafb.c | 6 ++---- + drivers/video/fbdev/vfb.c | 5 ++--- + drivers/video/fbdev/vga16fb.c | 6 ++---- + drivers/video/fbdev/via/via-gpio.c | 5 ++--- + drivers/video/fbdev/via/via_i2c.c | 5 ++--- + drivers/video/fbdev/vt8500lcdfb.c | 6 ++---- + drivers/video/fbdev/wm8505fb.c | 6 ++---- + drivers/video/fbdev/wmt_ge_rops.c | 5 ++--- + drivers/video/fbdev/xilinxfb.c | 6 ++---- + 62 files changed, 139 insertions(+), 241 deletions(-) +Merging regmap/for-next (4a670ac3e75e5 regmap: allow upshifting register addresses before performing operations) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Removing drivers/base/regmap/regcache-lzo.c +Merge made by the 'recursive' strategy. + drivers/base/regmap/Kconfig | 13 +- + drivers/base/regmap/Makefile | 5 +- + drivers/base/regmap/internal.h | 24 +- + drivers/base/regmap/regcache-lzo.c | 368 ----------------- + drivers/base/regmap/regcache-maple.c | 279 +++++++++++++ + drivers/base/regmap/regcache.c | 56 ++- + drivers/base/regmap/regmap-irq.c | 30 +- + drivers/base/regmap/regmap-kunit.c | 739 +++++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap-ram.c | 85 ++++ + drivers/base/regmap/regmap-sdw.c | 41 +- + drivers/base/regmap/regmap.c | 53 ++- + drivers/mfd/ocelot-spi.c | 2 +- + include/linux/regmap.h | 36 +- + 13 files changed, 1284 insertions(+), 447 deletions(-) + delete mode 100644 drivers/base/regmap/regcache-lzo.c + create mode 100644 drivers/base/regmap/regcache-maple.c + create mode 100644 drivers/base/regmap/regmap-kunit.c + create mode 100644 drivers/base/regmap/regmap-ram.c +Merging sound/for-next (714b2f025d767 ALSA: hda: LNL: add HD Audio PCI ID) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/pci/ymfpci/ymfpci_main.c +Auto-merging sound/pci/ymfpci/ymfpci.c +Merge made by the 'recursive' strategy. + Documentation/sound/alsa-configuration.rst | 5 +- + Documentation/sound/cards/audigy-mixer.rst | 27 ++++---- + Documentation/sound/cards/sb-live-mixer.rst | 17 +++-- + .../sound/kernel-api/writing-an-alsa-driver.rst | 22 +++++- + include/sound/ac97_codec.h | 3 + + include/sound/pcm-indirect.h | 22 ++++-- + include/uapi/sound/asound.h | 3 +- + sound/ac97_bus.c | 11 --- + sound/core/pcm_lib.c | 11 ++- + sound/core/pcm_native.c | 8 +-- + sound/drivers/portman2x4.c | 10 --- + sound/pci/Kconfig | 4 +- + sound/pci/asihpi/hpi6000.c | 2 - + sound/pci/hda/hda_intel.c | 3 + + sound/pci/rme9652/hdspm.c | 6 -- + sound/pci/ymfpci/ymfpci.c | 39 +++++++---- + sound/pci/ymfpci/ymfpci.h | 54 +++++++++++++-- + sound/pci/ymfpci/ymfpci_main.c | 79 ++++++---------------- + sound/usb/card.c | 1 - + sound/usb/endpoint.c | 16 +---- + sound/usb/helper.c | 1 - + tools/testing/selftests/alsa/mixer-test.c | 66 ++++++++++++++++-- + tools/testing/selftests/alsa/pcm-test.c | 23 +++++-- + 23 files changed, 255 insertions(+), 178 deletions(-) +Merging sound-asoc/for-next (21b3d1b501628 Merge remote-tracking branch 'asoc/for-6.4' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging sound/drivers/portman2x4.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/wm8994.txt +Removing Documentation/devicetree/bindings/sound/wm8960.txt +Removing Documentation/devicetree/bindings/sound/wm8711.txt +Removing Documentation/devicetree/bindings/sound/wm8580.txt +Removing Documentation/devicetree/bindings/sound/wm8524.txt +Removing Documentation/devicetree/bindings/sound/wm8523.txt +Removing Documentation/devicetree/bindings/sound/wm8510.txt +Removing Documentation/devicetree/bindings/sound/qcom,wcd9335.txt +Removing Documentation/devicetree/bindings/sound/maxim,max9759.txt +Removing Documentation/devicetree/bindings/sound/max9867.txt +Removing Documentation/devicetree/bindings/sound/max98371.txt +Removing Documentation/devicetree/bindings/sound/alc5632.txt +Removing Documentation/devicetree/bindings/sound/ak5558.txt +Removing Documentation/devicetree/bindings/sound/ak4458.txt +Removing Documentation/devicetree/bindings/sound/adi,adau17x1.txt +Merge made by the 'recursive' strategy. + .../bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml | 162 ++ + .../bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml | 205 +++ + .../devicetree/bindings/sound/adi,adau1372.yaml | 2 +- + .../devicetree/bindings/sound/adi,adau17x1.txt | 32 - + .../devicetree/bindings/sound/adi,adau17x1.yaml | 52 + + .../devicetree/bindings/sound/adi,max98363.yaml | 60 + + .../devicetree/bindings/sound/adi,max98396.yaml | 8 +- + Documentation/devicetree/bindings/sound/ak4458.txt | 28 - + Documentation/devicetree/bindings/sound/ak5558.txt | 24 - + .../devicetree/bindings/sound/alc5632.txt | 43 - + .../bindings/sound/asahi-kasei,ak4458.yaml | 73 + + .../bindings/sound/asahi-kasei,ak5558.yaml | 48 + + .../bindings/sound/audio-graph-port.yaml | 22 +- + .../devicetree/bindings/sound/audio-graph.yaml | 8 +- + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 10 +- + .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 80 +- + .../devicetree/bindings/sound/cirrus,cs42l42.yaml | 12 +- + .../bindings/sound/cirrus,ep9301-i2s.yaml | 66 + + .../devicetree/bindings/sound/everest,es8316.yaml | 4 + + .../devicetree/bindings/sound/fsl,qmc-audio.yaml | 117 ++ + .../devicetree/bindings/sound/max98371.txt | 17 - + .../devicetree/bindings/sound/max9867.txt | 17 - + .../devicetree/bindings/sound/maxim,max9759.txt | 18 - + .../devicetree/bindings/sound/maxim,max9759.yaml | 45 + + .../devicetree/bindings/sound/maxim,max98371.yaml | 42 + + .../devicetree/bindings/sound/maxim,max9867.yaml | 60 + + .../devicetree/bindings/sound/mt8186-afe-pcm.yaml | 6 +- + .../sound/mt8186-mt6366-da7219-max98357.yaml | 2 +- + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 2 +- + .../devicetree/bindings/sound/mt8192-afe-pcm.yaml | 6 +- + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 +- + .../devicetree/bindings/sound/mt8195-afe-pcm.yaml | 2 +- + .../devicetree/bindings/sound/mt8195-mt6359.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-alc5632.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-common.yaml | 4 + + .../sound/nvidia,tegra-audio-max9808x.yaml | 90 ++ + .../sound/nvidia,tegra-audio-max98090.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-rt5631.yaml | 85 + + .../bindings/sound/nvidia,tegra-audio-rt5640.yaml | 6 +- + .../bindings/sound/nvidia,tegra-audio-rt5677.yaml | 26 +- + .../sound/nvidia,tegra-audio-sgtl5000.yaml | 6 +- + .../bindings/sound/nvidia,tegra-audio-wm8753.yaml | 6 +- + .../bindings/sound/nvidia,tegra-audio-wm8903.yaml | 8 +- + .../bindings/sound/nvidia,tegra-audio-wm9712.yaml | 8 +- + .../bindings/sound/qcom,lpass-rx-macro.yaml | 77 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 81 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 86 +- + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 23 +- + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wcd9335.txt | 123 -- + .../devicetree/bindings/sound/qcom,wcd9335.yaml | 156 ++ + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 1 + + .../devicetree/bindings/sound/realtek,alc5632.yaml | 63 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 129 +- + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 21 +- + .../bindings/sound/rockchip,i2s-tdm.yaml | 7 + + .../devicetree/bindings/sound/rockchip-i2s.yaml | 5 + + .../devicetree/bindings/sound/sgtl5000.yaml | 6 +- + .../devicetree/bindings/sound/simple-card.yaml | 2 +- + .../bindings/sound/socionext,uniphier-aio.yaml | 2 +- + .../devicetree/bindings/sound/tas571x.txt | 1 + + .../devicetree/bindings/sound/wlf,wm8510.yaml | 41 + + .../devicetree/bindings/sound/wlf,wm8523.yaml | 40 + + .../devicetree/bindings/sound/wlf,wm8524.yaml | 40 + + .../devicetree/bindings/sound/wlf,wm8580.yaml | 42 + + .../devicetree/bindings/sound/wlf,wm8711.yaml | 40 + + .../devicetree/bindings/sound/wlf,wm8960.yaml | 88 ++ + .../devicetree/bindings/sound/wlf,wm8994.yaml | 194 +++ + Documentation/devicetree/bindings/sound/wm8510.txt | 18 - + Documentation/devicetree/bindings/sound/wm8523.txt | 16 - + Documentation/devicetree/bindings/sound/wm8524.txt | 16 - + Documentation/devicetree/bindings/sound/wm8580.txt | 16 - + Documentation/devicetree/bindings/sound/wm8711.txt | 18 - + Documentation/devicetree/bindings/sound/wm8960.txt | 42 - + Documentation/devicetree/bindings/sound/wm8994.txt | 112 -- + Documentation/sound/hd-audio/index.rst | 1 + + Documentation/sound/hd-audio/intel-multi-link.rst | 312 ++++ + MAINTAINERS | 36 +- + arch/powerpc/platforms/8xx/cpm1.c | 2 +- + drivers/firmware/cirrus/cs_dsp.c | 48 +- + drivers/soc/fsl/qe/Kconfig | 23 + + drivers/soc/fsl/qe/Makefile | 2 + + drivers/soc/fsl/qe/qmc.c | 1537 ++++++++++++++++++ + drivers/soc/fsl/qe/tsa.c | 846 ++++++++++ + drivers/soc/fsl/qe/tsa.h | 42 + + include/dt-bindings/soc/cpm1-fsl,tsa.h | 13 + + include/dt-bindings/sound/cs35l45.h | 57 + + include/linux/firmware/cirrus/cs_dsp.h | 1 + + include/soc/fsl/qe/qmc.h | 71 + + include/sound/cs35l41.h | 13 +- + include/sound/cs35l56.h | 270 ++++ + include/sound/hda-mlink.h | 166 ++ + include/sound/hda_register.h | 40 +- + include/sound/soc-dpcm.h | 1 - + include/sound/soc.h | 14 +- + include/sound/sof.h | 5 + + include/sound/sof/ipc4/header.h | 33 + + include/uapi/sound/sof/abi.h | 2 + + include/uapi/sound/sof/header.h | 27 +- + include/uapi/sound/sof/tokens.h | 21 +- + sound/arm/pxa2xx-ac97.c | 6 +- + sound/atmel/ac97c.c | 6 +- + sound/drivers/mts64.c | 6 +- + sound/drivers/portman2x4.c | 6 +- + sound/mips/hal2.c | 5 +- + sound/mips/sgio2audio.c | 5 +- + sound/pci/hda/cs35l41_hda.c | 6 +- + sound/pci/hda/hda_tegra.c | 6 +- + sound/ppc/powermac.c | 5 +- + sound/sh/aica.c | 7 +- + sound/sh/sh_dac_audio.c | 5 +- + sound/soc/adi/axi-i2s.c | 6 +- + sound/soc/adi/axi-spdif.c | 6 +- + sound/soc/amd/Kconfig | 2 + + sound/soc/amd/acp-pcm-dma.c | 6 +- + sound/soc/amd/acp/acp-rembrandt.c | 13 +- + sound/soc/amd/acp/acp-renoir.c | 5 +- + sound/soc/amd/ps/acp63.h | 2 + + sound/soc/amd/ps/pci-ps.c | 10 +- + sound/soc/amd/ps/ps-pdm-dma.c | 5 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 5 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 5 +- + sound/soc/amd/vangogh/acp5x-mach.c | 297 ++-- + sound/soc/amd/vangogh/acp5x-pcm-dma.c | 5 +- + sound/soc/amd/yc/acp6x-mach.c | 21 + + sound/soc/amd/yc/acp6x-pdm-dma.c | 5 +- + sound/soc/amd/yc/acp6x.h | 3 + + sound/soc/amd/yc/pci-acp6x.c | 8 +- + sound/soc/apple/mca.c | 5 +- + sound/soc/atmel/atmel-classd.c | 5 +- + sound/soc/atmel/atmel-i2s.c | 6 +- + sound/soc/atmel/atmel-pdmic.c | 5 +- + sound/soc/atmel/atmel_wm8904.c | 6 +- + sound/soc/atmel/mchp-i2s-mcc.c | 6 +- + sound/soc/atmel/mchp-pdmc.c | 25 +- + sound/soc/atmel/mchp-spdifrx.c | 6 +- + sound/soc/atmel/mchp-spdiftx.c | 51 +- + sound/soc/atmel/mikroe-proto.c | 6 +- + sound/soc/atmel/sam9g20_wm8731.c | 6 +- + sound/soc/atmel/sam9x5_wm8731.c | 6 +- + sound/soc/atmel/tse850-pcm5142.c | 6 +- + sound/soc/au1x/ac97c.c | 6 +- + sound/soc/au1x/i2sc.c | 6 +- + sound/soc/au1x/psc-ac97.c | 6 +- + sound/soc/au1x/psc-i2s.c | 6 +- + sound/soc/bcm/bcm63xx-i2s-whistler.c | 5 +- + sound/soc/bcm/cygnus-ssp.c | 6 +- + sound/soc/cirrus/Kconfig | 6 +- + sound/soc/cirrus/edb93xx.c | 6 +- + sound/soc/cirrus/ep93xx-i2s.c | 25 +- + sound/soc/codecs/Kconfig | 62 + + sound/soc/codecs/Makefile | 14 + + sound/soc/codecs/adau1977-spi.c | 2 +- + sound/soc/codecs/cs35l41-lib.c | 73 +- + sound/soc/codecs/cs35l41.c | 144 +- + sound/soc/codecs/cs35l41.h | 1 + + sound/soc/codecs/cs35l45-i2c.c | 3 + + sound/soc/codecs/cs35l45-spi.c | 5 + + sound/soc/codecs/cs35l45-tables.c | 135 +- + sound/soc/codecs/cs35l45.c | 630 +++++++- + sound/soc/codecs/cs35l45.h | 267 +++- + sound/soc/codecs/cs35l56-i2c.c | 83 + + sound/soc/codecs/cs35l56-sdw.c | 564 +++++++ + sound/soc/codecs/cs35l56-shared.c | 390 +++++ + sound/soc/codecs/cs35l56-spi.c | 80 + + sound/soc/codecs/cs35l56.c | 1652 ++++++++++++++++++++ + sound/soc/codecs/cs35l56.h | 82 + + sound/soc/codecs/cs4271-i2c.c | 1 - + sound/soc/codecs/cs4271-spi.c | 1 - + sound/soc/codecs/cs4271.c | 4 +- + sound/soc/codecs/cs42l42-sdw.c | 3 - + sound/soc/codecs/cs47l15.c | 6 +- + sound/soc/codecs/cs47l24.c | 6 +- + sound/soc/codecs/cs47l35.c | 6 +- + sound/soc/codecs/cs47l85.c | 6 +- + sound/soc/codecs/cs47l90.c | 6 +- + sound/soc/codecs/cs47l92.c | 6 +- + sound/soc/codecs/da7218.c | 10 +- + sound/soc/codecs/da7219-aad.c | 60 +- + sound/soc/codecs/da7219-aad.h | 5 +- + sound/soc/codecs/es8316.c | 14 +- + sound/soc/codecs/inno_rk3036.c | 6 +- + sound/soc/codecs/lpass-macro-common.c | 2 +- + sound/soc/codecs/lpass-macro-common.h | 3 + + sound/soc/codecs/lpass-rx-macro.c | 42 +- + sound/soc/codecs/lpass-tx-macro.c | 41 +- + sound/soc/codecs/lpass-va-macro.c | 6 +- + sound/soc/codecs/lpass-wsa-macro.c | 43 +- + sound/soc/codecs/max98363.c | 464 ++++++ + sound/soc/codecs/max98363.h | 36 + + sound/soc/codecs/max98373-sdw.c | 34 +- + sound/soc/codecs/max9867.c | 19 +- + sound/soc/codecs/msm8916-wcd-analog.c | 6 +- + sound/soc/codecs/msm8916-wcd-digital.c | 6 +- + sound/soc/codecs/mt6358.c | 2 +- + sound/soc/codecs/mt6359.c | 2 +- + sound/soc/codecs/nau8821.c | 96 ++ + sound/soc/codecs/nau8821.h | 23 + + sound/soc/codecs/pcm179x-spi.c | 2 +- + sound/soc/codecs/rk817_codec.c | 6 +- + sound/soc/codecs/rt1019.c | 2 +- + sound/soc/codecs/rt1308-sdw.c | 30 +- + sound/soc/codecs/rt1308-sdw.h | 4 - + sound/soc/codecs/rt1316-sdw.c | 30 +- + sound/soc/codecs/rt1316-sdw.h | 4 - + sound/soc/codecs/rt1318-sdw.c | 30 +- + sound/soc/codecs/rt1318-sdw.h | 4 - + sound/soc/codecs/rt5682-sdw.c | 34 +- + sound/soc/codecs/rt700.c | 30 +- + sound/soc/codecs/rt700.h | 4 - + sound/soc/codecs/rt711-sdca.c | 30 +- + sound/soc/codecs/rt711-sdca.h | 4 - + sound/soc/codecs/rt711.c | 30 +- + sound/soc/codecs/rt711.h | 4 - + sound/soc/codecs/rt712-sdca-dmic.c | 983 ++++++++++++ + sound/soc/codecs/rt712-sdca-dmic.h | 108 ++ + sound/soc/codecs/rt712-sdca.c | 30 +- + sound/soc/codecs/rt712-sdca.h | 4 - + sound/soc/codecs/rt715-sdca.c | 30 +- + sound/soc/codecs/rt715-sdca.h | 4 - + sound/soc/codecs/rt715.c | 30 +- + sound/soc/codecs/rt715.h | 4 - + sound/soc/codecs/sdw-mockup.c | 34 +- + sound/soc/codecs/sma1303.c | 2 +- + sound/soc/codecs/src4xxx-i2c.c | 2 +- + sound/soc/codecs/sta32x.c | 39 +- + sound/soc/codecs/sta350.c | 63 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tas571x.c | 59 + + sound/soc/codecs/tas5720.c | 3 +- + sound/soc/codecs/wcd938x.c | 6 +- + sound/soc/codecs/wm5102.c | 6 +- + sound/soc/codecs/wm5110.c | 6 +- + sound/soc/codecs/wm8903.c | 1 - + sound/soc/codecs/wm8994.c | 6 +- + sound/soc/codecs/wm8997.c | 6 +- + sound/soc/codecs/wm8998.c | 6 +- + sound/soc/codecs/wm_adsp.c | 63 +- + sound/soc/codecs/wm_adsp.h | 3 + + sound/soc/codecs/zl38060.c | 2 +- + sound/soc/dwc/dwc-i2s.c | 5 +- + sound/soc/fsl/Kconfig | 9 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/eukrea-tlv320.c | 6 +- + sound/soc/fsl/fsl-asoc-card.c | 7 +- + sound/soc/fsl/fsl_asrc.c | 6 +- + sound/soc/fsl/fsl_aud2htx.c | 6 +- + sound/soc/fsl/fsl_audmix.c | 6 +- + sound/soc/fsl/fsl_dma.c | 6 +- + sound/soc/fsl/fsl_easrc.c | 6 +- + sound/soc/fsl/fsl_esai.c | 6 +- + sound/soc/fsl/fsl_mqs.c | 5 +- + sound/soc/fsl/fsl_qmc_audio.c | 735 +++++++++ + sound/soc/fsl/fsl_rpmsg.c | 6 +- + sound/soc/fsl/fsl_sai.c | 18 +- + sound/soc/fsl/fsl_spdif.c | 6 +- + sound/soc/fsl/fsl_ssi.c | 8 +- + sound/soc/fsl/fsl_xcvr.c | 5 +- + sound/soc/fsl/imx-audmix.c | 14 +- + sound/soc/fsl/imx-audmux.c | 6 +- + sound/soc/fsl/imx-card.c | 2 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 6 +- + sound/soc/fsl/imx-sgtl5000.c | 6 +- + sound/soc/fsl/imx-spdif.c | 5 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 5 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 5 +- + sound/soc/fsl/mpc8610_hpcd.c | 6 +- + sound/soc/fsl/p1022_ds.c | 6 +- + sound/soc/fsl/p1022_rdk.c | 6 +- + sound/soc/fsl/pcm030-audio-fabric.c | 6 +- + sound/soc/generic/audio-graph-card.c | 15 +- + .../soc/generic/audio-graph-card2-custom-sample.c | 3 + + sound/soc/generic/audio-graph-card2.c | 23 +- + sound/soc/generic/simple-card-utils.c | 35 +- + sound/soc/generic/simple-card.c | 23 +- + sound/soc/generic/test-component.c | 6 +- + sound/soc/img/img-i2s-in.c | 6 +- + sound/soc/img/img-i2s-out.c | 6 +- + sound/soc/img/img-parallel-out.c | 6 +- + sound/soc/img/img-spdif-in.c | 6 +- + sound/soc/img/img-spdif-out.c | 6 +- + sound/soc/img/pistachio-internal-dac.c | 6 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 5 +- + sound/soc/intel/atom/sst/sst_acpi.c | 5 +- + sound/soc/intel/avs/boards/hdaudio.c | 10 +- + sound/soc/intel/avs/path.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 5 +- + sound/soc/intel/boards/bytcr_rt5640.c | 5 +- + sound/soc/intel/boards/bytcr_rt5651.c | 5 +- + sound/soc/intel/boards/bytcr_wm5102.c | 5 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +- + sound/soc/intel/boards/sof_es8336.c | 6 +- + sound/soc/intel/boards/sof_pcm512x.c | 6 +- + sound/soc/intel/boards/sof_rt5682.c | 28 +- + sound/soc/intel/boards/sof_sdw.c | 6 +- + sound/soc/intel/boards/sof_wm8804.c | 5 +- + sound/soc/intel/catpt/device.c | 6 +- + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 17 + + sound/soc/intel/skylake/skl-ssp-clk.c | 6 +- + sound/soc/kirkwood/kirkwood-i2s.c | 6 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 5 +- + sound/soc/mediatek/common/mtk-soundcard-driver.c | 12 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 6 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 5 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 28 +- + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 4 +- + .../mt8186/mt8186-mt6366-da7219-max98357.c | 2 +- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 6 +- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8192/mt8192-afe-clk.c | 4 - + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 11 +- + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 28 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 12 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 5 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 17 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 177 ++- + sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 26 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 2 +- + sound/soc/meson/aiu.c | 6 +- + sound/soc/meson/axg-card.c | 3 +- + sound/soc/meson/axg-tdm-interface.c | 13 +- + sound/soc/meson/gx-card.c | 3 +- + sound/soc/meson/meson-codec-glue.c | 5 +- + sound/soc/mxs/mxs-sgtl5000.c | 8 +- + sound/soc/pxa/mmp-sspa.c | 7 +- + sound/soc/pxa/pxa2xx-ac97.c | 5 +- + sound/soc/qcom/common.c | 17 +- + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 3 + + sound/soc/qcom/qdsp6/q6apm.c | 2 +- + sound/soc/qcom/qdsp6/q6routing.c | 6 +- + sound/soc/qcom/sdw.c | 7 +- + sound/soc/rockchip/rockchip_i2s.c | 7 +- + sound/soc/rockchip/rockchip_pdm.c | 6 +- + sound/soc/rockchip/rockchip_rt5645.c | 6 +- + sound/soc/rockchip/rockchip_spdif.c | 6 +- + sound/soc/samsung/aries_wm8994.c | 6 +- + sound/soc/samsung/arndale.c | 5 +- + sound/soc/samsung/bells.c | 21 +- + sound/soc/samsung/i2s.c | 10 +- + sound/soc/samsung/littlemill.c | 3 +- + sound/soc/samsung/lowland.c | 3 +- + sound/soc/samsung/odroid.c | 6 +- + sound/soc/samsung/pcm.c | 6 +- + sound/soc/samsung/snow.c | 6 +- + sound/soc/samsung/spdif.c | 6 +- + sound/soc/samsung/speyside.c | 3 +- + sound/soc/sh/fsi.c | 8 +- + sound/soc/sh/hac.c | 5 +- + sound/soc/sh/rcar/core.c | 6 +- + sound/soc/sh/rcar/ssi.c | 4 +- + sound/soc/sh/rz-ssi.c | 69 +- + sound/soc/sh/siu_dai.c | 5 +- + sound/soc/soc-compress.c | 10 +- + sound/soc/soc-core.c | 44 +- + sound/soc/soc-dai.c | 3 + + sound/soc/soc-dapm.c | 205 +-- + sound/soc/soc-jack.c | 1 + + sound/soc/soc-pcm.c | 20 +- + sound/soc/soc-topology.c | 10 +- + sound/soc/sof/amd/acp-common.c | 17 +- + sound/soc/sof/amd/acp-pcm.c | 34 + + sound/soc/sof/amd/acp.c | 45 +- + sound/soc/sof/amd/acp.h | 7 +- + sound/soc/sof/amd/pci-rmb.c | 91 +- + sound/soc/sof/amd/pci-rn.c | 91 +- + sound/soc/sof/amd/rembrandt.c | 4 - + sound/soc/sof/amd/renoir.c | 3 - + sound/soc/sof/core.c | 31 +- + sound/soc/sof/debug.c | 1 + + sound/soc/sof/intel/Kconfig | 7 + + sound/soc/sof/intel/Makefile | 5 +- + sound/soc/sof/intel/hda-ctrl.c | 9 +- + sound/soc/sof/intel/hda-dai-ops.c | 390 +++++ + sound/soc/sof/intel/hda-dai.c | 698 +++------ + sound/soc/sof/intel/hda-dsp.c | 41 +- + sound/soc/sof/intel/hda-ipc.c | 3 + + sound/soc/sof/intel/hda-loader.c | 7 +- + sound/soc/sof/intel/hda-mlink.c | 822 +++++++++- + sound/soc/sof/intel/hda-pcm.c | 24 +- + sound/soc/sof/intel/hda-stream.c | 82 +- + sound/soc/sof/intel/hda.c | 233 +-- + sound/soc/sof/intel/hda.h | 63 +- + sound/soc/sof/intel/mtl.c | 24 +- + sound/soc/sof/intel/pci-apl.c | 2 + + sound/soc/sof/intel/pci-cnl.c | 3 + + sound/soc/sof/intel/pci-icl.c | 2 + + sound/soc/sof/intel/pci-mtl.c | 1 + + sound/soc/sof/intel/pci-skl.c | 2 + + sound/soc/sof/intel/pci-tgl.c | 8 + + sound/soc/sof/ipc3-control.c | 90 +- + sound/soc/sof/ipc3-pcm.c | 1 + + sound/soc/sof/ipc4-control.c | 257 ++- + sound/soc/sof/ipc4-mtrace.c | 21 + + sound/soc/sof/ipc4-pcm.c | 181 ++- + sound/soc/sof/ipc4-topology.c | 1204 ++++++++++---- + sound/soc/sof/ipc4-topology.h | 89 +- + sound/soc/sof/loader.c | 4 +- + sound/soc/sof/pcm.c | 42 +- + sound/soc/sof/pm.c | 5 + + sound/soc/sof/sof-audio.c | 63 +- + sound/soc/sof/sof-audio.h | 43 +- + sound/soc/sof/sof-client.c | 3 + + sound/soc/sof/sof-priv.h | 11 + + sound/soc/sof/topology.c | 302 +++- + sound/soc/sprd/sprd-mcdt.c | 6 +- + sound/soc/stm/stm32_adfsdm.c | 6 +- + sound/soc/stm/stm32_i2s.c | 8 +- + sound/soc/stm/stm32_sai_sub.c | 10 +- + sound/soc/stm/stm32_spdifrx.c | 6 +- + sound/soc/sunxi/sun4i-codec.c | 6 +- + sound/soc/sunxi/sun4i-i2s.c | 6 +- + sound/soc/sunxi/sun4i-spdif.c | 6 +- + sound/soc/sunxi/sun50i-dmic.c | 6 +- + sound/soc/sunxi/sun8i-codec.c | 6 +- + sound/soc/tegra/Kconfig | 18 + + sound/soc/tegra/tegra186_asrc.c | 6 +- + sound/soc/tegra/tegra186_dspk.c | 6 +- + sound/soc/tegra/tegra20_ac97.c | 9 +- + sound/soc/tegra/tegra20_i2s.c | 6 +- + sound/soc/tegra/tegra210_admaif.c | 6 +- + sound/soc/tegra/tegra210_adx.c | 6 +- + sound/soc/tegra/tegra210_ahub.c | 6 +- + sound/soc/tegra/tegra210_amx.c | 6 +- + sound/soc/tegra/tegra210_dmic.c | 6 +- + sound/soc/tegra/tegra210_i2s.c | 6 +- + sound/soc/tegra/tegra210_mixer.c | 6 +- + sound/soc/tegra/tegra210_mvc.c | 6 +- + sound/soc/tegra/tegra210_ope.c | 6 +- + sound/soc/tegra/tegra210_sfc.c | 6 +- + sound/soc/tegra/tegra30_ahub.c | 6 +- + sound/soc/tegra/tegra30_i2s.c | 6 +- + sound/soc/tegra/tegra_asoc_machine.c | 127 +- + sound/soc/ti/ams-delta.c | 5 +- + sound/soc/ti/davinci-i2s.c | 6 +- + sound/soc/ti/davinci-mcasp.c | 6 +- + sound/soc/ti/omap-hdmi.c | 10 +- + sound/soc/ti/omap-mcbsp.c | 6 +- + sound/soc/uniphier/evea.c | 6 +- + sound/soc/ux500/mop500.c | 6 +- + sound/soc/ux500/ux500_msp_dai.c | 6 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 5 +- + sound/soc/xilinx/xlnx_spdif.c | 5 +- + sound/soc/xtensa/xtfpga-i2s.c | 5 +- + sound/sparc/cs4231.c | 6 +- + sound/sparc/dbri.c | 6 +- + 447 files changed, 17791 insertions(+), 4013 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.yaml + create mode 100644 Documentation/devicetree/bindings/sound/adi,max98363.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ak4458.txt + delete mode 100644 Documentation/devicetree/bindings/sound/ak5558.txt + delete mode 100644 Documentation/devicetree/bindings/sound/alc5632.txt + create mode 100644 Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml + create mode 100644 Documentation/devicetree/bindings/sound/asahi-kasei,ak5558.yaml + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,ep9301-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/max98371.txt + delete mode 100644 Documentation/devicetree/bindings/sound/max9867.txt + delete mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.txt + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98371.yaml + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9867.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max9808x.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5631.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd9335.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd9335.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,alc5632.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8510.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8523.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8524.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8580.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8711.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8960.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8994.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8524.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8960.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8994.txt + create mode 100644 Documentation/sound/hd-audio/intel-multi-link.rst + create mode 100644 drivers/soc/fsl/qe/qmc.c + create mode 100644 drivers/soc/fsl/qe/tsa.c + create mode 100644 drivers/soc/fsl/qe/tsa.h + create mode 100644 include/dt-bindings/soc/cpm1-fsl,tsa.h + create mode 100644 include/soc/fsl/qe/qmc.h + create mode 100644 include/sound/cs35l56.h + create mode 100644 include/sound/hda-mlink.h + create mode 100644 sound/soc/codecs/cs35l56-i2c.c + create mode 100644 sound/soc/codecs/cs35l56-sdw.c + create mode 100644 sound/soc/codecs/cs35l56-shared.c + create mode 100644 sound/soc/codecs/cs35l56-spi.c + create mode 100644 sound/soc/codecs/cs35l56.c + create mode 100644 sound/soc/codecs/cs35l56.h + create mode 100644 sound/soc/codecs/max98363.c + create mode 100644 sound/soc/codecs/max98363.h + create mode 100644 sound/soc/codecs/rt712-sdca-dmic.c + create mode 100644 sound/soc/codecs/rt712-sdca-dmic.h + create mode 100644 sound/soc/fsl/fsl_qmc_audio.c + create mode 100644 sound/soc/sof/intel/hda-dai-ops.c +$ git am -3 ../patches/0001-ASoC-cs42l42-fix-up-for-i2c-Make-remove-callback-ret.patch +Applying: ASoC: cs42l42: fix up for "i2c: Make remove callback return void" +Using index info to reconstruct a base tree... +M sound/soc/codecs/cs42l42-i2c.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +$ git am -3 ../patches/0001-ASoC-cs42l83-fix-up-for-i2c-Make-remove-callback-ret.patch +Applying: ASoC: cs42l83: fix up for "i2c: Make remove callback return void" +Using index info to reconstruct a base tree... +M sound/soc/codecs/cs42l83-i2c.c +Falling back to patching base and 3-way merge... +Auto-merging sound/soc/codecs/cs42l83-i2c.c +No changes -- Patch already applied. +Merging modules/modules-next (0a3bf86092c38 module: Ignore L0 and rename is_arm_mapping_symbol()) + 0ba3f7977eb74 ("ARM: tegra: remove MODULE_LICENSE in non-modules") + 295ff94c888cb ("soc/tegra: cbb: remove MODULE_LICENSE in non-modules") + 9016c09e90157 ("drivers/perf: remove MODULE_LICENSE in non-modules") +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging scripts/mod/modpost.c +Auto-merging scripts/gdb/linux/constants.py.in +CONFLICT (content): Merge conflict in scripts/gdb/linux/constants.py.in +Auto-merging mm/zswap.c +Auto-merging lib/Makefile +Auto-merging kernel/watch_queue.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/module/kallsyms.c +Auto-merging kernel/module/internal.h +Auto-merging kernel/Makefile +Auto-merging include/linux/module.h +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/video/fbdev/wmt_ge_rops.c +Auto-merging drivers/video/fbdev/wm8505fb.c +Auto-merging drivers/soc/tegra/cbb/tegra234-cbb.c +Auto-merging drivers/soc/tegra/cbb/tegra194-cbb.c +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging drivers/perf/apple_m1_cpu_pmu.c +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/interconnect/core.c +Auto-merging drivers/dma-buf/heaps/system_heap.c +Auto-merging drivers/clk/renesas/renesas-cpg-mssr.c +Auto-merging drivers/clk/microchip/clk-mpfs.c +Auto-merging arch/s390/kernel/module.c +Auto-merging arch/mips/kernel/vpe.c +Auto-merging MAINTAINERS +Recorded preimage for 'scripts/gdb/linux/constants.py.in' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'scripts/gdb/linux/constants.py.in'. +[master 5033a61d297c8] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/kernel-api.rst | 2 +- + .../translations/zh_CN/core-api/kernel-api.rst | 2 +- + MAINTAINERS | 13 +- + arch/arc/kernel/unwind.c | 12 +- + arch/arm/boot/compressed/decompress.c | 1 + + arch/arm/kernel/module-plts.c | 9 +- + arch/arm64/kernel/module-plts.c | 13 +- + arch/ia64/kernel/module.c | 24 +- + arch/mips/kernel/vpe.c | 11 +- + arch/parisc/kernel/module.c | 51 +- + arch/powerpc/kernel/module_32.c | 7 +- + arch/s390/kernel/module.c | 26 +- + arch/x86/crypto/blake2s-glue.c | 5 +- + arch/x86/kernel/callthunks.c | 4 +- + arch/x86/kernel/module.c | 4 +- + arch/x86/mm/debug_pagetables.c | 1 - + crypto/asymmetric_keys/asymmetric_type.c | 1 - + drivers/accessibility/braille/braille_console.c | 1 - + drivers/bus/arm-integrator-lm.c | 1 - + drivers/bus/bt1-apb.c | 1 - + drivers/bus/bt1-axi.c | 1 - + drivers/bus/intel-ixp4xx-eb.c | 1 - + drivers/bus/qcom-ebi2.c | 1 - + drivers/bus/qcom-ssc-block-bus.c | 1 - + drivers/bus/simple-pm-bus.c | 2 +- + drivers/clk/clk-bm1880.c | 1 - + drivers/clk/microchip/clk-mpfs.c | 1 - + drivers/clk/renesas/renesas-cpg-mssr.c | 1 - + drivers/clk/renesas/rzg2l-cpg.c | 1 - + drivers/clocksource/em_sti.c | 1 - + drivers/clocksource/sh_cmt.c | 1 - + drivers/clocksource/sh_mtu2.c | 1 - + drivers/clocksource/sh_tmu.c | 1 - + drivers/clocksource/timer-stm32-lp.c | 1 - + drivers/clocksource/timer-tegra186.c | 1 - + drivers/clocksource/timer-ti-dm.c | 1 - + drivers/dma-buf/heaps/cma_heap.c | 1 - + drivers/dma-buf/heaps/system_heap.c | 1 - + drivers/dma-buf/udmabuf.c | 1 - + drivers/dma/ep93xx_dma.c | 1 - + drivers/dma/ipu/ipu_idmac.c | 1 - + drivers/dma/mv_xor_v2.c | 1 - + drivers/dma/sh/shdma-base.c | 1 - + drivers/dma/stm32-dmamux.c | 1 - + drivers/dma/stm32-mdma.c | 1 - + drivers/edac/altera_edac.c | 1 - + drivers/firmware/broadcom/bcm47xx_nvram.c | 1 - + drivers/hwspinlock/hwspinlock_core.c | 1 - + drivers/infiniband/ulp/srp/ib_srp.c | 5 - + drivers/interconnect/core.c | 5 - + drivers/iommu/sun50i-iommu.c | 1 - + drivers/irqchip/irq-al-fic.c | 1 - + drivers/irqchip/irq-ls-scfg-msi.c | 1 - + drivers/irqchip/irq-mbigen.c | 1 - + drivers/irqchip/irq-mchp-eic.c | 1 - + drivers/irqchip/irq-renesas-intc-irqpin.c | 1 - + drivers/irqchip/irq-renesas-irqc.c | 1 - + drivers/irqchip/irq-renesas-rza1.c | 1 - + drivers/irqchip/irq-renesas-rzg2l.c | 1 - + drivers/irqchip/irq-sl28cpld.c | 1 - + drivers/irqchip/irq-ti-sci-inta.c | 1 - + drivers/irqchip/irq-ti-sci-intr.c | 1 - + drivers/mailbox/Kconfig | 2 +- + drivers/mailbox/rockchip-mailbox.c | 1 - + drivers/mfd/altera-sysmgr.c | 1 - + drivers/nvmem/core.c | 1 - + drivers/phy/intel/phy-intel-lgm-combo.c | 1 - + drivers/pinctrl/actions/pinctrl-s500.c | 1 - + drivers/pinctrl/actions/pinctrl-s700.c | 1 - + drivers/pinctrl/actions/pinctrl-s900.c | 1 - + drivers/pinctrl/bcm/pinctrl-ns.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8188.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 - + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 1 - + drivers/pinctrl/pinctrl-amd.c | 1 - + drivers/pinctrl/renesas/pinctrl-rza1.c | 1 - + drivers/pinctrl/renesas/pinctrl-rza2.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzn1.c | 1 - + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 1 - + drivers/power/reset/as3722-poweroff.c | 1 - + drivers/power/reset/gpio-poweroff.c | 1 - + drivers/power/reset/gpio-restart.c | 1 - + drivers/power/reset/keystone-reset.c | 1 - + drivers/power/reset/ltc2952-poweroff.c | 1 - + drivers/power/reset/mt6323-poweroff.c | 1 - + drivers/power/reset/regulator-poweroff.c | 1 - + drivers/power/reset/restart-poweroff.c | 1 - + drivers/power/reset/tps65086-restart.c | 1 - + drivers/power/supply/power_supply_core.c | 1 - + drivers/power/supply/wm97xx_battery.c | 1 - + drivers/regulator/stm32-pwr.c | 1 - + drivers/remoteproc/remoteproc_core.c | 1 - + drivers/reset/reset-lantiq.c | 1 - + drivers/reset/reset-microchip-sparx5.c | 1 - + drivers/reset/reset-mpfs.c | 1 - + drivers/soc/apple/apple-pmgr-pwrstate.c | 1 - + drivers/soc/fujitsu/a64fx-diag.c | 1 - + drivers/video/fbdev/wm8505fb.c | 1 - + drivers/video/fbdev/wmt_ge_rops.c | 1 - + fs/binfmt_elf.c | 1 - + fs/nfs_common/nfs_ssc.c | 1 - + fs/unicode/utf8-core.c | 1 - + include/linux/dynamic_debug.h | 68 +- + include/linux/kallsyms.h | 7 +- + include/linux/module.h | 141 +++- + include/linux/module_symbol.h | 17 + + kernel/Makefile | 1 - + kernel/dma/map_benchmark.c | 1 - + kernel/events/hw_breakpoint_test.c | 1 - + kernel/kallsyms.c | 5 +- + kernel/kallsyms_selftest.c | 6 +- + kernel/livepatch/core.c | 3 +- + kernel/module/Makefile | 4 +- + kernel/module/decompress.c | 2 +- + kernel/module/internal.h | 47 +- + kernel/module/kallsyms.c | 78 +- + kernel/module/kdb.c | 17 +- + kernel/{ => module}/kmod.c | 0 + kernel/module/main.c | 903 +++++++++++---------- + kernel/module/procfs.c | 16 +- + kernel/module/strict_rwx.c | 99 +-- + kernel/module/tree_lookup.c | 39 +- + kernel/params.c | 2 +- + kernel/trace/ftrace.c | 3 +- + kernel/trace/rv/reactor_panic.c | 1 - + kernel/trace/rv/reactor_printk.c | 1 - + kernel/watch_queue.c | 1 - + lib/Makefile | 3 + + lib/btree.c | 1 - + lib/crypto/blake2s-generic.c | 5 - + lib/crypto/blake2s.c | 1 - + lib/dynamic_debug.c | 51 +- + lib/pldmfw/pldmfw.c | 1 - + lib/test_fprobe.c | 1 - + mm/zpool.c | 1 - + mm/zswap.c | 1 - + scripts/gdb/linux/constants.py.in | 3 + + scripts/gdb/linux/modules.py | 4 +- + scripts/gdb/linux/symbols.py | 4 +- + scripts/mod/modpost.c | 12 +- + 142 files changed, 904 insertions(+), 930 deletions(-) + create mode 100644 include/linux/module_symbol.h + rename kernel/{ => module}/kmod.c (100%) +Merging input/next (c55d84fb2bd89 dt-bindings: input: pwm-beeper: convert to dt schema) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/touchscreen/sun4i-ts.c +Auto-merging drivers/input/joystick/xpad.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/input/pwm-beeper.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/adc-joystick.yaml | 4 +- + .../bindings/input/google,cros-ec-keyb.yaml | 4 +- + .../devicetree/bindings/input/imx-keypad.yaml | 2 +- + .../devicetree/bindings/input/matrix-keymap.yaml | 2 +- + .../bindings/input/mediatek,mt6779-keypad.yaml | 2 +- + .../bindings/input/microchip,cap11xx.yaml | 4 +- + .../devicetree/bindings/input/pwm-beeper.txt | 24 - + .../devicetree/bindings/input/pwm-beeper.yaml | 41 ++ + .../devicetree/bindings/input/pwm-vibrator.yaml | 4 +- + .../bindings/input/regulator-haptic.yaml | 4 +- + .../input/touchscreen/elan,elants_i2c.yaml | 4 +- + MAINTAINERS | 6 + + arch/arm/mach-pxa/spitz.c | 1 + + drivers/input/Kconfig | 10 + + drivers/input/Makefile | 1 + + drivers/input/joystick/xpad.c | 46 +- + drivers/input/keyboard/gpio_keys.c | 3 + + drivers/input/keyboard/iqs62x-keys.c | 2 +- + drivers/input/keyboard/matrix_keypad.c | 6 +- + drivers/input/keyboard/omap4-keypad.c | 3 +- + drivers/input/keyboard/samsung-keypad.c | 3 +- + drivers/input/keyboard/st-keyscan.c | 2 +- + drivers/input/keyboard/tegra-kbc.c | 3 +- + drivers/input/keyboard/tm2-touchkey.c | 2 +- + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/cma3000_d0x.c | 2 - + drivers/input/misc/hp_sdc_rtc.c | 2 +- + drivers/input/misc/nxp-bbnsm-pwrkey.c | 193 ++++++++ + drivers/input/rmi4/rmi_bus.c | 2 +- + drivers/input/tests/.kunitconfig | 3 + + drivers/input/tests/Makefile | 3 + + drivers/input/tests/input_test.c | 150 +++++++ + drivers/input/touchscreen/Kconfig | 11 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/bcm_iproc_tsc.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 496 +++++++++++---------- + drivers/input/touchscreen/hideep.c | 33 +- + drivers/input/touchscreen/melfas_mip4.c | 19 +- + drivers/input/touchscreen/novatek-nvt-ts.c | 301 +++++++++++++ + drivers/input/touchscreen/raspberrypi-ts.c | 3 +- + drivers/input/touchscreen/sun4i-ts.c | 2 +- + drivers/input/touchscreen/tsc2007_core.c | 17 +- + drivers/input/touchscreen/zinitix.c | 2 +- + include/linux/input/matrix_keypad.h | 5 +- + 45 files changed, 1104 insertions(+), 338 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/pwm-beeper.txt + create mode 100644 Documentation/devicetree/bindings/input/pwm-beeper.yaml + create mode 100644 drivers/input/misc/nxp-bbnsm-pwrkey.c + create mode 100644 drivers/input/tests/.kunitconfig + create mode 100644 drivers/input/tests/Makefile + create mode 100644 drivers/input/tests/input_test.c + create mode 100644 drivers/input/touchscreen/novatek-nvt-ts.c +Merging block/for-next (7001edb72462d Merge branch 'for-6.4/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging sound/core/pcm_native.c +Auto-merging mm/shmem.c +Auto-merging mm/madvise.c +Auto-merging mm/filemap.c +Auto-merging lib/iov_iter.c +Auto-merging lib/Kconfig.debug +Auto-merging io_uring/rsrc.c +Auto-merging io_uring/kbuf.c +Auto-merging io_uring/io_uring.c +Auto-merging include/linux/uio.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/bio.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/splice.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/direct-io.c +Auto-merging fs/btrfs/file.c +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c +Auto-merging drivers/infiniband/hw/hfi1/file_ops.c +Auto-merging drivers/block/ublk_drv.c +Auto-merging block/blk-mq.c +Removing block/blk-mq-tag.h +Auto-merging block/blk-core.c +Auto-merging block/blk-cgroup.h +Auto-merging block/blk-cgroup.c +Auto-merging block/bio.c +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-block | 15 +- + Documentation/block/inline-encryption.rst | 3 +- + Documentation/fault-injection/fault-injection.rst | 8 + + arch/s390/include/uapi/asm/dasd.h | 2 + + block/bfq-cgroup.c | 20 +- + block/bfq-iosched.c | 17 +- + block/bfq-iosched.h | 1 - + block/bio.c | 29 +- + block/blk-cgroup.c | 147 +++-- + block/blk-cgroup.h | 12 +- + block/blk-core.c | 6 - + block/blk-crypto-internal.h | 38 +- + block/blk-crypto-profile.c | 60 +- + block/blk-crypto.c | 66 ++- + block/blk-flush.c | 17 +- + block/blk-iocost.c | 58 +- + block/blk-iolatency.c | 39 +- + block/blk-map.c | 29 +- + block/blk-merge.c | 2 + + block/blk-mq-cpumap.c | 1 - + block/blk-mq-debugfs.c | 28 - + block/blk-mq-pci.c | 1 - + block/blk-mq-sched.c | 143 +---- + block/blk-mq-sched.h | 7 - + block/blk-mq-sysfs.c | 2 - + block/blk-mq-tag.c | 2 - + block/blk-mq-tag.h | 73 --- + block/blk-mq-virtio.c | 1 - + block/blk-mq.c | 665 +++++++++------------- + block/blk-mq.h | 77 ++- + block/blk-pm.c | 2 - + block/blk-rq-qos.h | 2 +- + block/blk-stat.c | 23 +- + block/blk-sysfs.c | 26 +- + block/blk-throttle.c | 19 +- + block/blk.h | 18 +- + block/elevator.h | 4 +- + block/kyber-iosched.c | 7 +- + block/mq-deadline.c | 13 +- + block/opal_proto.h | 10 + + block/sed-opal.c | 301 ++++++++-- + drivers/block/drbd/drbd_actlog.c | 13 +- + drivers/block/drbd/drbd_bitmap.c | 13 +- + drivers/block/drbd/drbd_int.h | 120 ++-- + drivers/block/drbd/drbd_main.c | 72 ++- + drivers/block/drbd/drbd_nl.c | 19 +- + drivers/block/drbd/drbd_receiver.c | 102 ++-- + drivers/block/drbd/drbd_req.c | 30 +- + drivers/block/drbd/drbd_req.h | 11 +- + drivers/block/drbd/drbd_state.c | 29 +- + drivers/block/drbd/drbd_worker.c | 114 ++-- + drivers/block/nbd.c | 9 +- + drivers/block/null_blk/Kconfig | 2 +- + drivers/block/null_blk/main.c | 130 +++-- + drivers/block/null_blk/null_blk.h | 7 +- + drivers/block/ublk_drv.c | 85 ++- + drivers/char/random.c | 4 +- + drivers/infiniband/hw/hfi1/file_ops.c | 10 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 4 +- + drivers/md/dm-table.c | 19 +- + drivers/net/tun.c | 3 +- + drivers/s390/block/dasd.c | 75 ++- + drivers/s390/block/dasd_devmap.c | 126 ++++ + drivers/s390/block/dasd_eckd.c | 1 + + drivers/s390/block/dasd_eer.c | 1 + + drivers/s390/block/dasd_int.h | 32 +- + drivers/tty/tty_io.c | 4 +- + drivers/vhost/scsi.c | 2 +- + fs/btrfs/file.c | 11 +- + fs/cifs/cifsfs.c | 8 +- + fs/cifs/cifsfs.h | 3 - + fs/cifs/file.c | 16 - + fs/coda/file.c | 29 +- + fs/direct-io.c | 2 + + fs/ext4/file.c | 3 +- + fs/fuse/file.c | 2 +- + fs/iomap/direct-io.c | 1 - + fs/kernfs/file.c | 2 +- + fs/overlayfs/file.c | 23 +- + fs/proc/inode.c | 4 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc_namespace.c | 6 +- + fs/read_write.c | 11 +- + fs/splice.c | 76 ++- + fs/xfs/xfs_file.c | 3 +- + include/linux/bio.h | 5 +- + include/linux/blk-crypto.h | 4 +- + include/linux/blk-mq.h | 2 - + include/linux/blk_types.h | 3 +- + include/linux/blkdev.h | 12 - + include/linux/fault-inject.h | 22 + + include/linux/fs.h | 3 + + include/linux/genl_magic_func.h | 2 +- + include/linux/io_uring_types.h | 22 +- + include/linux/sed-opal.h | 1 + + include/linux/splice.h | 3 + + include/linux/uio.h | 80 +-- + include/trace/events/io_uring.h | 15 +- + include/uapi/linux/io_uring.h | 32 +- + include/uapi/linux/sed-opal.h | 11 + + io_uring/alloc_cache.h | 39 +- + io_uring/io-wq.c | 524 ++++++++--------- + io_uring/io_uring.c | 343 +++++++---- + io_uring/io_uring.h | 49 +- + io_uring/kbuf.c | 160 ++++-- + io_uring/kbuf.h | 7 + + io_uring/net.c | 4 +- + io_uring/net.h | 5 +- + io_uring/notif.c | 6 +- + io_uring/notif.h | 2 +- + io_uring/poll.c | 32 +- + io_uring/rsrc.c | 239 +++----- + io_uring/rsrc.h | 65 ++- + io_uring/rw.c | 45 +- + io_uring/timeout.c | 14 +- + io_uring/uring_cmd.c | 18 +- + lib/Kconfig.debug | 13 +- + lib/fault-inject.c | 191 +++++++ + lib/iov_iter.c | 555 +++--------------- + mm/filemap.c | 4 +- + mm/madvise.c | 9 +- + mm/shmem.c | 134 ++++- + sound/core/pcm_native.c | 26 +- + 123 files changed, 3093 insertions(+), 2841 deletions(-) + delete mode 100644 block/blk-mq-tag.h +$ git am -3 ../patches/0001-fix-up-for-iov_iter-add-copy_page_to_iter_nofault.patch +Applying: fix up for "iov_iter: add copy_page_to_iter_nofault()" +$ git reset HEAD^ +Unstaged changes after reset: +M lib/iov_iter.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 4935e8451d72d] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git + Date: Fri Apr 14 14:13:45 2023 +0100 +Merging device-mapper/for-next (3664ff82dae1e dm: add helper macro for simple DM target module init and exit) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/md/dm-bufio.c +Merge made by the 'recursive' strategy. + drivers/md/dm-bio-prison-v1.c | 94 +- + drivers/md/dm-bio-prison-v1.h | 15 + + drivers/md/dm-bufio.c | 1980 +++++++++++++++++++++++++++------------ + drivers/md/dm-cache-target.c | 1 - + drivers/md/dm-clone-target.c | 2 +- + drivers/md/dm-crypt.c | 20 +- + drivers/md/dm-delay.c | 26 +- + drivers/md/dm-dust.c | 19 +- + drivers/md/dm-ebs-target.c | 19 +- + drivers/md/dm-era-target.c | 22 +- + drivers/md/dm-flakey.c | 20 +- + drivers/md/dm-integrity.c | 15 +- + drivers/md/dm-io.c | 4 +- + drivers/md/dm-kcopyd.c | 4 +- + drivers/md/dm-linear.c | 6 +- + drivers/md/dm-log-writes.c | 21 +- + drivers/md/dm-log.c | 24 +- + drivers/md/dm-mpath.c | 5 +- + drivers/md/dm-raid.c | 22 +- + drivers/md/dm-raid1.c | 24 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-snap.c | 12 +- + drivers/md/dm-stripe.c | 4 +- + drivers/md/dm-switch.c | 20 +- + drivers/md/dm-table.c | 6 +- + drivers/md/dm-target.c | 20 +- + drivers/md/dm-thin.c | 125 ++- + drivers/md/dm-unstripe.c | 14 +- + drivers/md/dm-verity-fec.c | 4 +- + drivers/md/dm-verity-target.c | 42 +- + drivers/md/dm-writecache.c | 22 +- + drivers/md/dm-zero.c | 31 +- + drivers/md/dm-zoned-metadata.c | 6 +- + drivers/md/dm-zoned-target.c | 16 +- + drivers/md/dm.c | 25 +- + drivers/md/dm.h | 22 + + include/linux/device-mapper.h | 26 + + include/linux/dm-bufio.h | 6 - + include/uapi/linux/dm-ioctl.h | 4 +- + 39 files changed, 1705 insertions(+), 1045 deletions(-) +Merging libata/for-next (140b26035b2d3 ata: pata_parport-bpck6: Declare mode_map as static) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Removing drivers/ata/pata_parport/ppc6lnx.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-platform.yaml | 49 +- + drivers/ata/Kconfig | 1 + + drivers/ata/ahci_mtk.c | 2 +- + drivers/ata/libahci_platform.c | 2 +- + drivers/ata/pata_parport/Kconfig | 2 +- + drivers/ata/pata_parport/aten.c | 45 +- + drivers/ata/pata_parport/bpck.c | 86 +-- + drivers/ata/pata_parport/bpck6.c | 541 ++++++++++----- + drivers/ata/pata_parport/comm.c | 52 +- + drivers/ata/pata_parport/dstr.c | 45 +- + drivers/ata/pata_parport/epat.c | 48 +- + drivers/ata/pata_parport/epia.c | 55 +- + drivers/ata/pata_parport/fit2.c | 37 +- + drivers/ata/pata_parport/fit3.c | 39 +- + drivers/ata/pata_parport/friq.c | 56 +- + drivers/ata/pata_parport/frpw.c | 71 +- + drivers/ata/pata_parport/kbic.c | 66 +- + drivers/ata/pata_parport/ktti.c | 38 +- + drivers/ata/pata_parport/on20.c | 45 +- + drivers/ata/pata_parport/on26.c | 52 +- + drivers/ata/pata_parport/pata_parport.c | 31 +- + .../ata/pata_parport}/pata_parport.h | 41 +- + drivers/ata/pata_parport/ppc6lnx.c | 726 --------------------- + drivers/ata/sata_dwc_460ex.c | 4 +- + drivers/parport/parport_pc.c | 20 +- + include/linux/ata.h | 71 -- + include/uapi/linux/parport.h | 3 + + 27 files changed, 683 insertions(+), 1545 deletions(-) + rename {include/linux => drivers/ata/pata_parport}/pata_parport.h (75%) + delete mode 100644 drivers/ata/pata_parport/ppc6lnx.c +Merging pcmcia/pcmcia-next (15e74c6c1ce2d pcmcia: remove AT91RM9200 Compact Flash driver) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (ec49843332dff mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 25 ---- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 2 +- + .../bindings/mmc/fujitsu,sdhci-fujitsu.yaml | 15 ++- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 1 + + .../devicetree/bindings/mmc/sdhci-msm.yaml | 1 + + drivers/memstick/host/r592.c | 2 +- + drivers/mmc/core/core.c | 5 + + drivers/mmc/core/debugfs.c | 2 +- + drivers/mmc/core/mmc_test.c | 6 +- + drivers/mmc/core/regulator.c | 44 ++++++ + drivers/mmc/host/dw_mmc-pltfm.c | 3 +- + drivers/mmc/host/jz4740_mmc.c | 3 +- + drivers/mmc/host/meson-gx-mmc.c | 24 +--- + drivers/mmc/host/mmci.c | 22 +-- + drivers/mmc/host/omap.c | 3 +- + drivers/mmc/host/omap_hsmmc.c | 8 +- + drivers/mmc/host/owl-mmc.c | 3 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 10 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 4 +- + drivers/mmc/host/sdhci-of-arasan.c | 38 ++---- + drivers/mmc/host/sdhci-of-aspeed.c | 3 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 9 +- + drivers/mmc/host/sdhci-of-esdhc.c | 24 ++-- + drivers/mmc/host/sdhci-pci-o2micro.c | 30 +++-- + drivers/mmc/host/sdhci-pltfm.c | 4 - + drivers/mmc/host/sdhci-pxav2.c | 2 +- + drivers/mmc/host/sdhci-s3c.c | 4 +- + drivers/mmc/host/sdhci_am654.c | 147 ++++++++++++++++++--- + drivers/mmc/host/sdricoh_cs.c | 8 -- + drivers/mmc/host/tmio_mmc_core.c | 2 +- + drivers/mmc/host/usdhi6rol0.c | 3 +- + drivers/mmc/host/wmt-sdmmc.c | 6 +- + include/linux/mmc/host.h | 3 + + 33 files changed, 284 insertions(+), 182 deletions(-) +Merging mfd/for-mfd-next (9d8d0d98885ab dt-bindings: mfd: syscon: Add nuvoton,ma35d1-sys compatible) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Removing include/linux/mfd/samsung/s5m8763.h +Auto-merging drivers/mfd/ocelot-spi.c +Auto-merging drivers/gpio/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-counter | 32 + + .../bindings/mfd/canaan,k210-sysctl.yaml | 6 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 22 +- + .../bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max5970.yaml | 151 ++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 7 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 4 + + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 2 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 + + .../devicetree/bindings/mfd/ti,nspire-misc.yaml | 51 ++ + .../devicetree/bindings/mfd/wlf,arizona.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,ac100.yaml | 4 +- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 16 +- + .../devicetree/bindings/mfd/xylon,logicvc.yaml | 4 +- + .../devicetree/bindings/timer/renesas,rz-mtu3.yaml | 302 +++++++ + MAINTAINERS | 8 + + drivers/counter/Kconfig | 11 + + drivers/counter/Makefile | 1 + + drivers/counter/rz-mtu3-cnt.c | 902 +++++++++++++++++++++ + drivers/gpio/Kconfig | 12 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-ljca.c | 454 +++++++++++ + drivers/mfd/88pm860x-core.c | 4 +- + drivers/mfd/Kconfig | 23 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/arizona-i2c.c | 1 + + drivers/mfd/arizona-spi.c | 1 + + drivers/mfd/atc260x-i2c.c | 2 +- + drivers/mfd/atmel-flexcom.c | 4 +- + drivers/mfd/atmel-smc.c | 2 +- + drivers/mfd/axp20x.c | 1 + + drivers/mfd/bcm2835-pm.c | 3 +- + drivers/mfd/da903x.c | 1 - + drivers/mfd/da9052-core.c | 1 - + drivers/mfd/da9052-i2c.c | 1 - + drivers/mfd/da9052-spi.c | 1 - + drivers/mfd/da9055-core.c | 1 - + drivers/mfd/da9055-i2c.c | 1 - + drivers/mfd/da9062-core.c | 176 ++-- + drivers/mfd/dln2.c | 1 + + drivers/mfd/ezx-pcap.c | 1 - + drivers/mfd/hi6421-pmic-core.c | 4 +- + drivers/mfd/intel-lpss-pci.c | 15 + + drivers/mfd/intel_soc_pmic_chtwc.c | 14 +- + drivers/mfd/intel_soc_pmic_crc.c | 1 - + drivers/mfd/ipaq-micro.c | 4 +- + drivers/mfd/khadas-mcu.c | 2 +- + drivers/mfd/lp8788.c | 1 - + drivers/mfd/mfd-core.c | 26 - + drivers/mfd/ocelot-spi.c | 1 + + drivers/mfd/omap-usb-host.c | 1 - + drivers/mfd/omap-usb-tll.c | 6 - + drivers/mfd/qcom-pm8008.c | 132 ++- + drivers/mfd/qcom_rpm.c | 4 +- + drivers/mfd/rsmu.h | 2 + + drivers/mfd/rsmu_i2c.c | 165 +++- + drivers/mfd/rsmu_spi.c | 48 +- + drivers/mfd/rz-mtu3.c | 391 +++++++++ + drivers/mfd/rz-mtu3.h | 147 ++++ + drivers/mfd/sec-core.c | 46 -- + drivers/mfd/sec-irq.c | 89 -- + drivers/mfd/si476x-cmd.c | 14 +- + drivers/mfd/simple-mfd-i2c.c | 13 + + drivers/mfd/ssbi.c | 4 +- + drivers/mfd/stmpe-i2c.c | 1 - + drivers/mfd/stmpe-spi.c | 1 - + drivers/mfd/stmpe.c | 2 +- + drivers/mfd/sun4i-gpadc.c | 4 +- + drivers/mfd/tc3589x.c | 1 - + drivers/mfd/tps6586x.c | 1 - + drivers/mfd/tqmx86.c | 52 +- + drivers/mfd/twl-core.c | 65 -- + drivers/mfd/twl4030-audio.c | 1 - + drivers/mfd/twl6040.c | 1 - + drivers/mfd/wm8994-core.c | 19 +- + drivers/rtc/rtc-s5m.c | 82 +- + include/linux/mfd/core.h | 20 +- + include/linux/mfd/max597x.h | 96 +++ + include/linux/mfd/rsmu.h | 5 +- + include/linux/mfd/rt5033-private.h | 17 +- + include/linux/mfd/rt5033.h | 7 +- + include/linux/mfd/rz-mtu3.h | 257 ++++++ + include/linux/mfd/samsung/core.h | 2 - + include/linux/mfd/samsung/irq.h | 50 -- + include/linux/mfd/samsung/s5m8763.h | 90 -- + 87 files changed, 3289 insertions(+), 841 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max5970.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml + create mode 100644 Documentation/devicetree/bindings/timer/renesas,rz-mtu3.yaml + create mode 100644 drivers/counter/rz-mtu3-cnt.c + create mode 100644 drivers/gpio/gpio-ljca.c + create mode 100644 drivers/mfd/rz-mtu3.c + create mode 100644 drivers/mfd/rz-mtu3.h + create mode 100644 include/linux/mfd/max597x.h + create mode 100644 include/linux/mfd/rz-mtu3.h + delete mode 100644 include/linux/mfd/samsung/s5m8763.h +$ git am -3 ../patches/0001-fixup-for-mfd-qcom-pm8008-Convert-irq-chip-to-config.patch +Applying: fixup for "mfd: qcom-pm8008: Convert irq chip to config regs" +Using index info to reconstruct a base tree... +M drivers/mfd/qcom-pm8008.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging backlight/for-backlight-next (fb200218b40b7 backlight: as3711: Use of_property_read_bool() for boolean properties) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/aat2870_bl.c | 6 ++---- + drivers/video/backlight/adp5520_bl.c | 6 ++---- + drivers/video/backlight/arcxcnn_bl.c | 2 +- + drivers/video/backlight/as3711_bl.c | 24 ++++++++++++------------ + drivers/video/backlight/cr_bllcd.c | 6 ++---- + drivers/video/backlight/da9052_bl.c | 6 ++---- + drivers/video/backlight/hp680_bl.c | 6 ++---- + drivers/video/backlight/hx8357.c | 2 +- + drivers/video/backlight/led_bl.c | 6 ++---- + drivers/video/backlight/lm3533_bl.c | 6 ++---- + drivers/video/backlight/lp855x_bl.c | 2 +- + drivers/video/backlight/lp8788_bl.c | 6 ++---- + drivers/video/backlight/mt6370-backlight.c | 6 ++---- + drivers/video/backlight/pwm_bl.c | 6 ++---- + drivers/video/backlight/qcom-wled.c | 7 +++---- + drivers/video/backlight/rt4831-backlight.c | 6 ++---- + drivers/video/backlight/sky81452-backlight.c | 6 ++---- + 17 files changed, 42 insertions(+), 67 deletions(-) +Merging battery/for-next (baba1315a74d1 power: supply: rk817: Fix low SOC bugs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Removing include/linux/power/generic-adc-battery.h +Auto-merging drivers/power/supply/power_supply_core.c +Merge made by the 'recursive' strategy. + .../bindings/power/supply/adc-battery.yaml | 70 ++++++ + drivers/power/reset/qcom-pon.c | 2 +- + drivers/power/supply/axp288_charger.c | 15 +- + drivers/power/supply/bq24257_charger.c | 2 +- + drivers/power/supply/bq256xx_charger.c | 40 ++++ + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/charger-manager.c | 2 +- + drivers/power/supply/generic-adc-battery.c | 245 ++++++--------------- + drivers/power/supply/lp8727_charger.c | 2 +- + drivers/power/supply/ltc4162-l-charger.c | 2 +- + drivers/power/supply/power_supply_core.c | 179 +++++++++++++-- + drivers/power/supply/power_supply_sysfs.c | 23 +- + drivers/power/supply/rk817_charger.c | 46 ++-- + drivers/power/supply/rt9455_charger.c | 2 +- + drivers/power/supply/twl4030_charger.c | 2 +- + include/linux/power/generic-adc-battery.h | 23 -- + include/linux/power_supply.h | 8 + + 17 files changed, 412 insertions(+), 253 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/adc-battery.yaml + delete mode 100644 include/linux/power/generic-adc-battery.h +Merging regulator/for-next (c55470f8b0616 Merge remote-tracking branch 'regulator/for-6.4' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging drivers/regulator/stm32-pwr.c +Auto-merging drivers/regulator/max8973-regulator.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/dlg,da9063.yaml | 17 +- + .../bindings/regulator/anatop-regulator.yaml | 22 +- + .../devicetree/bindings/regulator/dlg,da9121.yaml | 2 +- + .../bindings/regulator/fcs,fan53555.yaml | 21 +- + .../bindings/regulator/fixed-regulator.yaml | 2 +- + .../regulator/google,cros-ec-regulator.yaml | 2 +- + .../bindings/regulator/gpio-regulator.yaml | 2 +- + .../bindings/regulator/max77650-regulator.yaml | 2 +- + .../devicetree/bindings/regulator/max8660.yaml | 2 +- + .../devicetree/bindings/regulator/max8893.yaml | 2 +- + .../regulator/mediatek,mt6331-regulator.yaml | 12 +- + .../regulator/mediatek,mt6332-regulator.yaml | 4 +- + .../devicetree/bindings/regulator/mps,mp5416.yaml | 4 +- + .../devicetree/bindings/regulator/mps,mp886x.yaml | 2 +- + .../devicetree/bindings/regulator/mps,mpq7920.yaml | 6 +- + .../bindings/regulator/mt6315-regulator.yaml | 2 +- + .../bindings/regulator/mt6359-regulator.yaml | 16 +- + .../bindings/regulator/mt6360-regulator.yaml | 4 +- + .../bindings/regulator/nxp,pca9450-regulator.yaml | 4 +- + .../bindings/regulator/nxp,pf8x00-regulator.yaml | 21 +- + .../devicetree/bindings/regulator/pfuze100.yaml | 8 +- + .../bindings/regulator/qcom,rpmh-regulator.yaml | 29 +- + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 2 +- + ...pberrypi,7inch-touchscreen-panel-regulator.yaml | 2 +- + .../devicetree/bindings/regulator/regulator.yaml | 22 +- + .../bindings/regulator/richtek,rt4803.yaml | 68 +++++ + .../bindings/regulator/richtek,rt5739.yaml | 72 +++++ + .../regulator/richtek,rt6245-regulator.yaml | 8 +- + .../regulator/richtek,rtmv20-regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd71815-regulator.yaml | 8 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 8 +- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 6 +- + .../bindings/regulator/rohm,bd71847-regulator.yaml | 6 +- + .../bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- + .../regulator/socionext,uniphier-regulator.yaml | 2 +- + .../bindings/regulator/st,stm32-booster.yaml | 4 +- + .../bindings/regulator/st,stm32-vrefbuf.yaml | 2 +- + .../bindings/regulator/st,stm32mp1-pwr-reg.yaml | 2 +- + .../devicetree/bindings/regulator/ti,tps62360.yaml | 2 +- + .../regulator/vqmmc-ipq4019-regulator.yaml | 2 +- + .../devicetree/bindings/regulator/wlf,arizona.yaml | 6 +- + drivers/regulator/88pg86x.c | 1 + + drivers/regulator/88pm800-regulator.c | 1 + + drivers/regulator/88pm8607.c | 1 + + drivers/regulator/Kconfig | 23 ++ + drivers/regulator/Makefile | 2 + + drivers/regulator/aat2870-regulator.c | 1 + + drivers/regulator/ab8500-ext.c | 1 + + drivers/regulator/ab8500.c | 1 + + drivers/regulator/act8865-regulator.c | 1 + + drivers/regulator/act8945a-regulator.c | 1 + + drivers/regulator/ad5398.c | 1 + + drivers/regulator/anatop-regulator.c | 1 + + drivers/regulator/arizona-ldo1.c | 2 + + drivers/regulator/arizona-micsupp.c | 2 + + drivers/regulator/as3711-regulator.c | 1 + + drivers/regulator/as3722-regulator.c | 1 + + drivers/regulator/atc260x-regulator.c | 1 + + drivers/regulator/axp20x-regulator.c | 1 + + drivers/regulator/bcm590xx-regulator.c | 1 + + drivers/regulator/bd71815-regulator.c | 9 +- + drivers/regulator/bd71828-regulator.c | 3 +- + drivers/regulator/bd718x7-regulator.c | 1 + + drivers/regulator/bd9571mwv-regulator.c | 1 + + drivers/regulator/bd9576-regulator.c | 1 + + drivers/regulator/core.c | 100 ++++++- + drivers/regulator/cpcap-regulator.c | 1 + + drivers/regulator/cros-ec-regulator.c | 1 + + drivers/regulator/da903x-regulator.c | 1 + + drivers/regulator/da9052-regulator.c | 1 + + drivers/regulator/da9055-regulator.c | 1 + + drivers/regulator/da9062-regulator.c | 1 + + drivers/regulator/da9063-regulator.c | 148 +++++++++-- + drivers/regulator/da9121-regulator.c | 1 + + drivers/regulator/da9210-regulator.c | 1 + + drivers/regulator/da9211-regulator.c | 1 + + drivers/regulator/db8500-prcmu.c | 1 + + drivers/regulator/dummy.c | 1 + + drivers/regulator/fan53555.c | 193 +++++++++++--- + drivers/regulator/fan53880.c | 1 + + drivers/regulator/fixed.c | 3 +- + drivers/regulator/gpio-regulator.c | 3 +- + drivers/regulator/hi6421-regulator.c | 1 + + drivers/regulator/hi6421v530-regulator.c | 1 + + drivers/regulator/hi6421v600-regulator.c | 1 + + drivers/regulator/hi655x-regulator.c | 1 + + drivers/regulator/isl6271a-regulator.c | 1 + + drivers/regulator/isl9305.c | 1 + + drivers/regulator/lm363x-regulator.c | 1 + + drivers/regulator/lochnagar-regulator.c | 1 + + drivers/regulator/lp3971.c | 1 + + drivers/regulator/lp3972.c | 1 + + drivers/regulator/lp872x.c | 6 +- + drivers/regulator/lp873x-regulator.c | 1 + + drivers/regulator/lp8755.c | 1 + + drivers/regulator/lp87565-regulator.c | 1 + + drivers/regulator/lp8788-buck.c | 1 + + drivers/regulator/lp8788-ldo.c | 2 + + drivers/regulator/ltc3589.c | 1 + + drivers/regulator/ltc3676.c | 1 + + drivers/regulator/max14577-regulator.c | 1 + + drivers/regulator/max1586.c | 1 + + drivers/regulator/max20086-regulator.c | 3 +- + drivers/regulator/max20411-regulator.c | 1 + + drivers/regulator/max597x-regulator.c | 1 + + drivers/regulator/max77620-regulator.c | 1 + + drivers/regulator/max77650-regulator.c | 1 + + drivers/regulator/max77686-regulator.c | 1 + + drivers/regulator/max77693-regulator.c | 1 + + drivers/regulator/max77802-regulator.c | 1 + + drivers/regulator/max77826-regulator.c | 1 + + drivers/regulator/max8649.c | 1 + + drivers/regulator/max8660.c | 1 + + drivers/regulator/max8893.c | 1 + + drivers/regulator/max8907-regulator.c | 1 + + drivers/regulator/max8925-regulator.c | 1 + + drivers/regulator/max8952.c | 1 + + drivers/regulator/max8973-regulator.c | 1 + + drivers/regulator/max8997-regulator.c | 12 +- + drivers/regulator/max8998.c | 4 +- + drivers/regulator/mc13783-regulator.c | 1 + + drivers/regulator/mc13892-regulator.c | 1 + + drivers/regulator/mcp16502.c | 1 + + drivers/regulator/mp5416.c | 1 + + drivers/regulator/mp8859.c | 3 +- + drivers/regulator/mp886x.c | 1 + + drivers/regulator/mpq7920.c | 1 + + drivers/regulator/mt6311-regulator.c | 1 + + drivers/regulator/mt6315-regulator.c | 1 + + drivers/regulator/mt6323-regulator.c | 1 + + drivers/regulator/mt6331-regulator.c | 1 + + drivers/regulator/mt6332-regulator.c | 1 + + drivers/regulator/mt6357-regulator.c | 1 + + drivers/regulator/mt6358-regulator.c | 1 + + drivers/regulator/mt6359-regulator.c | 1 + + drivers/regulator/mt6360-regulator.c | 1 + + drivers/regulator/mt6370-regulator.c | 1 + + drivers/regulator/mt6380-regulator.c | 1 + + drivers/regulator/mt6397-regulator.c | 3 +- + drivers/regulator/mtk-dvfsrc-regulator.c | 1 + + drivers/regulator/palmas-regulator.c | 1 + + drivers/regulator/pbias-regulator.c | 1 + + drivers/regulator/pca9450-regulator.c | 1 + + drivers/regulator/pcap-regulator.c | 1 + + drivers/regulator/pcf50633-regulator.c | 1 + + drivers/regulator/pf8x00-regulator.c | 1 + + drivers/regulator/pfuze100-regulator.c | 1 + + drivers/regulator/pv88060-regulator.c | 1 + + drivers/regulator/pv88080-regulator.c | 1 + + drivers/regulator/pv88090-regulator.c | 1 + + drivers/regulator/pwm-regulator.c | 3 +- + drivers/regulator/qcom-labibb-regulator.c | 1 + + drivers/regulator/qcom-rpmh-regulator.c | 56 ++++ + drivers/regulator/qcom_rpm-regulator.c | 1 + + drivers/regulator/qcom_smd-regulator.c | 6 +- + drivers/regulator/qcom_spmi-regulator.c | 1 + + drivers/regulator/qcom_usb_vbus-regulator.c | 1 + + drivers/regulator/rc5t583-regulator.c | 1 + + drivers/regulator/rk808-regulator.c | 3 +- + drivers/regulator/rn5t618-regulator.c | 1 + + drivers/regulator/rpi-panel-attiny-regulator.c | 1 + + drivers/regulator/rt4801-regulator.c | 1 + + drivers/regulator/rt4803.c | 216 +++++++++++++++ + drivers/regulator/rt4831-regulator.c | 1 + + drivers/regulator/rt5033-regulator.c | 1 + + drivers/regulator/rt5120-regulator.c | 1 + + drivers/regulator/rt5190a-regulator.c | 1 + + drivers/regulator/rt5739.c | 291 +++++++++++++++++++++ + drivers/regulator/rt5759-regulator.c | 1 + + drivers/regulator/rt6160-regulator.c | 1 + + drivers/regulator/rt6190-regulator.c | 1 + + drivers/regulator/rt6245-regulator.c | 1 + + drivers/regulator/rtmv20-regulator.c | 1 + + drivers/regulator/rtq2134-regulator.c | 1 + + drivers/regulator/rtq6752-regulator.c | 1 + + drivers/regulator/s2mpa01.c | 1 + + drivers/regulator/s2mps11.c | 1 + + drivers/regulator/s5m8767.c | 18 +- + drivers/regulator/sc2731-regulator.c | 1 + + drivers/regulator/sky81452-regulator.c | 1 + + drivers/regulator/slg51000-regulator.c | 1 + + drivers/regulator/sm5703-regulator.c | 1 + + drivers/regulator/stm32-booster.c | 1 + + drivers/regulator/stm32-pwr.c | 8 +- + drivers/regulator/stm32-vrefbuf.c | 1 + + drivers/regulator/stpmic1_regulator.c | 3 +- + drivers/regulator/stw481x-vmmc.c | 1 + + drivers/regulator/sy7636a-regulator.c | 1 + + drivers/regulator/sy8106a-regulator.c | 1 + + drivers/regulator/sy8824x.c | 1 + + drivers/regulator/sy8827n.c | 1 + + drivers/regulator/ti-abb-regulator.c | 1 + + drivers/regulator/tps51632-regulator.c | 1 + + drivers/regulator/tps6105x-regulator.c | 1 + + drivers/regulator/tps62360-regulator.c | 16 +- + drivers/regulator/tps6286x-regulator.c | 1 + + drivers/regulator/tps65023-regulator.c | 1 + + drivers/regulator/tps6507x-regulator.c | 1 + + drivers/regulator/tps65086-regulator.c | 1 + + drivers/regulator/tps65090-regulator.c | 1 + + drivers/regulator/tps65132-regulator.c | 1 + + drivers/regulator/tps65217-regulator.c | 1 + + drivers/regulator/tps65218-regulator.c | 1 + + drivers/regulator/tps65219-regulator.c | 1 + + drivers/regulator/tps6524x-regulator.c | 1 + + drivers/regulator/tps6586x-regulator.c | 1 + + drivers/regulator/tps65910-regulator.c | 1 + + drivers/regulator/tps65912-regulator.c | 1 + + drivers/regulator/tps68470-regulator.c | 1 + + drivers/regulator/twl-regulator.c | 1 + + drivers/regulator/twl6030-regulator.c | 3 +- + drivers/regulator/uniphier-regulator.c | 1 + + drivers/regulator/userspace-consumer.c | 1 + + drivers/regulator/vctrl-regulator.c | 1 + + drivers/regulator/vexpress-regulator.c | 1 + + drivers/regulator/virtual.c | 1 + + drivers/regulator/vqmmc-ipq4019-regulator.c | 1 + + drivers/regulator/wm831x-dcdc.c | 4 + + drivers/regulator/wm831x-isink.c | 1 + + drivers/regulator/wm831x-ldo.c | 3 + + drivers/regulator/wm8350-regulator.c | 1 + + drivers/regulator/wm8400-regulator.c | 1 + + drivers/regulator/wm8994-regulator.c | 1 + + include/linux/mfd/da9063/registers.h | 23 ++ + 224 files changed, 1477 insertions(+), 260 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt4803.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rt5739.yaml + create mode 100644 drivers/regulator/rt4803.c + create mode 100644 drivers/regulator/rt5739.c +Merging security/next (d82dcd9e21b77 reiserfs: Add security prefix to xattr name in reiserfs_security_write()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging security/Kconfig +Auto-merging include/linux/security.h +Auto-merging fs/ocfs2/xattr.c +Merge made by the 'recursive' strategy. + fs/ocfs2/namei.c | 2 + + fs/ocfs2/xattr.c | 30 +- + fs/reiserfs/xattr_security.c | 31 +- + include/linux/lsm_hook_defs.h | 2 +- + include/linux/lsm_hooks.h | 1625 +----------------------- + include/linux/security.h | 12 - + security/Kconfig | 16 +- + security/device_cgroup.c | 2 +- + security/integrity/iint.c | 9 +- + security/security.c | 2734 +++++++++++++++++++++++++++++++++++++++-- + 10 files changed, 2695 insertions(+), 1768 deletions(-) +Merging apparmor/apparmor-next (0bb84cff96af2 apparmor: fix missing error check for rhashtable_insert_fast) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/policy_unpack.c +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/domain.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2038 and retry the command. +Merge made by the 'recursive' strategy. + security/apparmor/crypto.c | 10 +++++----- + security/apparmor/domain.c | 2 +- + security/apparmor/file.c | 2 +- + security/apparmor/include/task.h | 2 +- + security/apparmor/policy.c | 7 ++----- + security/apparmor/policy_unpack.c | 11 ++++++++--- + security/apparmor/policy_unpack_test.c | 13 ++++++------- + security/apparmor/secid.c | 3 +-- + security/apparmor/task.c | 5 +---- + 9 files changed, 26 insertions(+), 29 deletions(-) +Merging integrity/next-integrity (644f17412f5ac IMA: allow/fix UML builds) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'recursive' strategy. + security/integrity/ima/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging safesetid/safesetid-next (64b634830c919 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (4ce1f694eb5d8 selinux: ensure av_permissions.h is built when needed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/security.c +Auto-merging security/Kconfig +Auto-merging include/linux/lsm_hooks.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../sysfs-selinux-checkreqprot | 3 + + .../{obsolete => removed}/sysfs-selinux-disable | 3 + + MAINTAINERS | 4 +- + include/linux/lsm_hooks.h | 30 - + security/Kconfig | 5 - + security/apparmor/lsm.c | 6 +- + security/bpf/hooks.c | 4 +- + security/commoncap.c | 2 +- + security/landlock/cred.c | 2 +- + security/landlock/fs.c | 2 +- + security/landlock/ptrace.c | 2 +- + security/landlock/setup.c | 4 +- + security/loadpin/loadpin.c | 2 +- + security/lockdown/lockdown.c | 2 +- + security/security.c | 4 +- + security/selinux/Kconfig | 47 -- + security/selinux/Makefile | 4 +- + security/selinux/avc.c | 276 +++++----- + security/selinux/hooks.c | 612 +++++++-------------- + security/selinux/ibpkey.c | 2 +- + security/selinux/ima.c | 37 +- + security/selinux/include/avc.h | 29 +- + security/selinux/include/avc_ss.h | 3 +- + security/selinux/include/conditional.h | 4 +- + security/selinux/include/ima.h | 10 +- + security/selinux/include/security.h | 185 ++----- + security/selinux/netif.c | 2 +- + security/selinux/netlabel.c | 17 +- + security/selinux/netnode.c | 4 +- + security/selinux/netport.c | 2 +- + security/selinux/selinuxfs.c | 258 +++------ + security/selinux/ss/services.c | 346 +++++------- + security/selinux/ss/services.h | 1 - + security/selinux/status.c | 44 +- + security/selinux/xfrm.c | 20 +- + security/smack/smack_lsm.c | 4 +- + security/tomoyo/tomoyo.c | 6 +- + security/yama/yama_lsm.c | 2 +- + 38 files changed, 735 insertions(+), 1255 deletions(-) + rename Documentation/ABI/{obsolete => removed}/sysfs-selinux-checkreqprot (90%) + rename Documentation/ABI/{obsolete => removed}/sysfs-selinux-disable (90%) +Merging smack/next (de93e515db306 Smack: Improve mount process memory use) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'recursive' strategy. + security/smack/smack_lsm.c | 64 +++++++++++++++++----------------------------- + 1 file changed, 24 insertions(+), 40 deletions(-) +Merging tomoyo/master (ab8527429de6a workqueue: Emit runtime message when flush_scheduled_work() is called) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + security/tomoyo/audit.c | 6 +++--- + security/tomoyo/common.c | 2 +- + security/tomoyo/common.h | 44 -------------------------------------------- + 5 files changed, 8 insertions(+), 48 deletions(-) +Merging tpmdd/next (5903ed4cf40e9 integrity: machine keyring CA configuration) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'recursive' strategy. + certs/system_keyring.c | 14 +++++++-- + crypto/asymmetric_keys/restrict.c | 40 +++++++++++++++++++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 50 +++++++++++++++++++++++++++++++ + drivers/char/tpm/eventlog/common.c | 6 ++-- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 3 +- + include/crypto/public_key.h | 28 +++++++++++++++++ + security/integrity/Kconfig | 23 +++++++++++++- + security/integrity/digsig.c | 8 +++-- + 8 files changed, 161 insertions(+), 11 deletions(-) +Merging watchdog/master (09a9639e56c01 Linux 6.3-rc6) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (8a7244a6d8617 Merge branches 'iommu/fixes', 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/omap', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 'unisoc', 'x86/vt-d', 'x86/amd', 'core' and 'platform-remove_new' into next) + 08632365b274e ("iommu/sun50i: remove MODULE_LICENSE in non-modules") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging mm/init-mm.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched/mm.h +Removing include/linux/ioasid.h +Auto-merging drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +Removing drivers/iommu/ioasid.c +Auto-merging arch/arm64/boot/dts/mediatek/mt8195.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8186.dtsi +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-kernel-iommu_groups | 1 - + Documentation/arch/x86/sva.rst | 2 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 45 ++- + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 32 +- + .../bindings/media/mediatek,mt8195-jpegdec.yaml | 7 - + .../bindings/media/mediatek,mt8195-jpegenc.yaml | 7 - + .../bindings/media/mediatek,vcodec-decoder.yaml | 5 - + .../bindings/media/mediatek,vcodec-encoder.yaml | 5 - + .../bindings/media/mediatek-jpeg-encoder.yaml | 5 - + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 1 + + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 4 +- + arch/x86/kernel/traps.c | 2 +- + drivers/dma/idxd/device.c | 8 +- + drivers/dma/idxd/idxd.h | 2 +- + drivers/dma/idxd/init.c | 33 +- + drivers/dma/idxd/irq.c | 2 +- + drivers/iommu/Kconfig | 9 +- + drivers/iommu/Makefile | 1 - + drivers/iommu/amd/amd_iommu.h | 9 + + drivers/iommu/amd/amd_iommu_types.h | 12 +- + drivers/iommu/amd/init.c | 30 +- + drivers/iommu/amd/io_pgtable.c | 4 +- + drivers/iommu/amd/io_pgtable_v2.c | 25 +- + drivers/iommu/amd/iommu.c | 17 +- + drivers/iommu/apple-dart.c | 6 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 32 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 16 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 14 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 12 +- + drivers/iommu/exynos-iommu.c | 24 +- + drivers/iommu/fsl_pamu.c | 9 +- + drivers/iommu/intel/cap_audit.c | 2 - + drivers/iommu/intel/dmar.c | 13 +- + drivers/iommu/intel/iommu.c | 277 ++++++-------- + drivers/iommu/intel/iommu.h | 35 +- + drivers/iommu/intel/irq_remapping.c | 2 +- + drivers/iommu/intel/pasid.c | 43 --- + drivers/iommu/intel/pasid.h | 7 - + drivers/iommu/intel/svm.c | 3 +- + drivers/iommu/ioasid.c | 422 --------------------- + drivers/iommu/iommu-sva.c | 61 +-- + drivers/iommu/iommu-sva.h | 4 - + drivers/iommu/iommu.c | 315 +++++++-------- + drivers/iommu/ipmmu-vmsa.c | 23 +- + drivers/iommu/msm_iommu.c | 5 +- + drivers/iommu/mtk_iommu.c | 158 ++++++-- + drivers/iommu/mtk_iommu_v1.c | 5 +- + drivers/iommu/omap-iommu.c | 7 +- + drivers/iommu/rockchip-iommu.c | 61 ++- + drivers/iommu/sprd-iommu.c | 60 ++- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 3 - + .../platform/mediatek/vcodec/mtk_vcodec_dec_drv.c | 8 - + .../platform/mediatek/vcodec/mtk_vcodec_enc_drv.c | 3 - + include/linux/ioasid.h | 83 ---- + include/linux/iommu.h | 14 +- + include/linux/sched/mm.h | 26 -- + kernel/fork.c | 1 + + mm/init-mm.c | 4 +- + 58 files changed, 787 insertions(+), 1239 deletions(-) + delete mode 100644 drivers/iommu/ioasid.c + delete mode 100644 include/linux/ioasid.h +Merging audit/next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (1d8b6c2831af1 Merge branch 'dt/address-cleanups' into dt/next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging include/linux/cpufreq.h +Auto-merging drivers/soc/mediatek/mtk-svs.c +Auto-merging drivers/opp/of.c +Auto-merging drivers/cpuidle/cpuidle-riscv-sbi.c +Auto-merging drivers/cpufreq/tegra20-cpufreq.c +Auto-merging drivers/cpufreq/tegra124-cpufreq.c +Auto-merging drivers/cpufreq/qcom-cpufreq-hw.c +Auto-merging drivers/cpufreq/pmac32-cpufreq.c +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +Auto-merging drivers/base/cacheinfo.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +Auto-merging Documentation/devicetree/bindings/watchdog/apple,wdt.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Removing Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt +Auto-merging Documentation/devicetree/bindings/sound/simple-card.yaml +Auto-merging Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml +Auto-merging Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml +Auto-merging Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml +Auto-merging Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml +Auto-merging Documentation/devicetree/bindings/sound/everest,es8316.yaml +Auto-merging Documentation/devicetree/bindings/soc/renesas/renesas.yaml +Removing Documentation/devicetree/bindings/rtc/snvs-rtc.txt +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml +Auto-merging Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml +Auto-merging Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml +Auto-merging Documentation/devicetree/bindings/net/mdio-gpio.yaml +Auto-merging Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml +Auto-merging Documentation/devicetree/bindings/mfd/google,cros-ec.yaml +Auto-merging Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml +Auto-merging Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +Removing Documentation/devicetree/bindings/iommu/qcom,iommu.txt +Auto-merging Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml +Removing Documentation/devicetree/bindings/input/snvs-pwrkey.txt +Auto-merging Documentation/devicetree/bindings/input/google,cros-ec-keyb.yaml +Removing Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt +Removing Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt +Removing Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.txt +Removing Documentation/devicetree/bindings/display/bridge/ps8622.txt +Auto-merging Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml +Auto-merging Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml +Removing Documentation/devicetree/bindings/crypto/fsl-sec4.txt +Auto-merging Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml +Auto-merging Documentation/devicetree/bindings/clock/qcom,a53pll.yaml +Auto-merging Documentation/devicetree/bindings/cache/qcom,llcc.yaml +Auto-merging Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml +Auto-merging Documentation/devicetree/bindings/ata/ahci-platform.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ata/ahci-platform.yaml +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Resolved 'Documentation/devicetree/bindings/ata/ahci-platform.yaml' using previous resolution. +Resolved 'Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml' using previous resolution. +Resolved 'Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml' using previous resolution. +Resolved 'Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d6ba689e66c9b] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/.yamllint | 2 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 1 + + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 5 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 4 + + .../devicetree/bindings/ata/ahci-common.yaml | 6 +- + .../devicetree/bindings/ata/renesas,rcar-sata.yaml | 4 +- + .../bindings/auxdisplay/holtek,ht16k33.yaml | 2 +- + .../bindings/bus/allwinner,sun50i-a64-de2.yaml | 1 + + .../bindings/bus/allwinner,sun8i-a23-rsb.yaml | 1 + + Documentation/devicetree/bindings/bus/palmbus.yaml | 1 + + .../baikal,bt1-l2-ctl.yaml | 2 +- + .../l2cache.txt => cache/freescale-l2cache.txt} | 0 + .../devicetree/bindings/{arm => cache}/l2c2x0.yaml | 2 +- + .../marvell,feroceon-cache.txt} | 0 + .../marvell,tauros2-cache.txt} | 0 + .../bindings/{arm/msm => cache}/qcom,llcc.yaml | 2 +- + .../bindings/{riscv => cache}/sifive,ccache0.yaml | 2 +- + .../socionext,uniphier-system-cache.yaml | 2 +- + .../bindings/chrome/google,cros-ec-typec.yaml | 2 +- + .../chrome/google,cros-kbd-led-backlight.yaml | 2 +- + .../devicetree/bindings/clock/arm,syscon-icst.yaml | 4 +- + .../bindings/clock/mediatek,apmixedsys.yaml | 4 +- + .../bindings/clock/mediatek,topckgen.yaml | 4 +- + .../devicetree/bindings/clock/qcom,a53pll.yaml | 4 +- + .../bindings/clock/renesas,cpg-mssr.yaml | 4 +- + .../clock/renesas,rcar-usb2-clock-sel.yaml | 4 +- + .../bindings/clock/renesas,rzg2l-cpg.yaml | 4 +- + .../bindings/clock/samsung,exynos850-clock.yaml | 2 +- + .../bindings/clock/sprd,sc9863a-clk.yaml | 4 +- + .../devicetree/bindings/clock/sprd,ums512-clk.yaml | 4 +- + .../devicetree/bindings/clock/ti,lmk04832.yaml | 2 +- + .../bindings/clock/xlnx,clocking-wizard.yaml | 4 +- + .../bindings/crypto/fsl,sec-v4.0-mon.yaml | 156 ++++++ + .../devicetree/bindings/crypto/fsl,sec-v4.0.yaml | 266 ++++++++++ + .../devicetree/bindings/crypto/fsl-sec4.txt | 553 --------------------- + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 4 +- + .../bindings/display/bridge/analogix,anx7625.yaml | 2 +- + .../bindings/display/bridge/anx6345.yaml | 2 +- + .../bindings/display/bridge/lontium,lt8912b.yaml | 2 +- + .../bindings/display/bridge/nxp,ptn3460.yaml | 2 +- + .../bindings/display/bridge/parade,ps8622.yaml | 115 +++++ + .../devicetree/bindings/display/bridge/ps8622.txt | 31 -- + .../devicetree/bindings/display/bridge/ps8640.yaml | 2 +- + .../bindings/display/bridge/sil,sii9234.yaml | 2 +- + .../bindings/display/bridge/ti,dlpc3433.yaml | 2 +- + .../bindings/display/bridge/toshiba,tc358762.yaml | 2 +- + .../bindings/display/bridge/toshiba,tc358764.txt | 35 -- + .../bindings/display/bridge/toshiba,tc358764.yaml | 89 ++++ + .../bindings/display/bridge/toshiba,tc358768.yaml | 2 +- + .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 2 +- + .../devicetree/bindings/display/msm/qcom,mdss.yaml | 4 + + .../bindings/display/panel/nec,nl8048hl11.yaml | 2 +- + .../bindings/display/solomon,ssd1307fb.yaml | 4 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 2 +- + .../devicetree/bindings/example-schema.yaml | 2 + + .../bindings/extcon/extcon-usbc-cros-ec.yaml | 2 +- + .../bindings/extcon/extcon-usbc-tusb320.yaml | 2 +- + .../bindings/fpga/xilinx-pr-decoupler.txt | 54 -- + .../bindings/fpga/xilinx-slave-serial.txt | 51 -- + .../bindings/fpga/xlnx,fpga-slave-serial.yaml | 80 +++ + .../bindings/fpga/xlnx,pr-decoupler.yaml | 64 +++ + .../devicetree/bindings/gpio/gpio-pca9570.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 8 +- + .../bindings/gpio/x-powers,axp209-gpio.yaml | 1 + + .../devicetree/bindings/hwmon/adi,ltc2992.yaml | 1 + + .../devicetree/bindings/i2c/aspeed,i2c.yaml | 2 +- + .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- + .../devicetree/bindings/input/snvs-pwrkey.txt | 1 - + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 1 + + .../interrupt-controller/actions,owl-sirq.yaml | 4 +- + .../bindings/interrupt-controller/arm,gic-v3.yaml | 2 + + .../bindings/interrupt-controller/arm,gic.yaml | 4 +- + .../interrupt-controller/fsl,irqsteer.yaml | 4 +- + .../interrupt-controller/intel,ce4100-ioapic.yaml | 4 +- + .../interrupt-controller/intel,ce4100-lapic.yaml | 4 +- + .../intel,ixp4xx-interrupt.yaml | 4 +- + .../interrupt-controller/loongson,htpic.yaml | 4 +- + .../interrupt-controller/loongson,htvec.yaml | 4 +- + .../interrupt-controller/loongson,liointc.yaml | 8 +- + .../interrupt-controller/loongson,pch-msi.yaml | 10 +- + .../interrupt-controller/loongson,pch-pic.yaml | 6 +- + .../interrupt-controller/mediatek,sysirq.txt | 1 + + .../bindings/interrupt-controller/mrvl,intc.yaml | 4 +- + .../mscc,ocelot-icpu-intr.yaml | 4 +- + .../interrupt-controller/sifive,plic-1.0.0.yaml | 2 +- + .../bindings/interrupt-controller/ti,sci-inta.yaml | 3 + + .../devicetree/bindings/iommu/qcom,iommu.txt | 122 ----- + .../devicetree/bindings/iommu/qcom,iommu.yaml | 113 +++++ + .../bindings/leds/cznic,turris-omnia-leds.yaml | 2 +- + .../devicetree/bindings/leds/issi,is31fl319x.yaml | 2 +- + .../devicetree/bindings/leds/leds-aw2013.yaml | 2 +- + .../devicetree/bindings/leds/leds-rt4505.yaml | 2 +- + .../devicetree/bindings/leds/ti,tca6507.yaml | 2 +- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 4 +- + .../bindings/mailbox/microchip,mpfs-mailbox.yaml | 4 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 4 +- + .../devicetree/bindings/mailbox/sprd-mailbox.yaml | 4 +- + .../devicetree/bindings/mailbox/st,stm32-ipcc.yaml | 4 +- + .../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 5 +- + .../bindings/media/i2c/aptina,mt9p031.yaml | 2 +- + .../bindings/media/i2c/aptina,mt9v111.yaml | 2 +- + .../devicetree/bindings/media/i2c/imx219.yaml | 2 +- + .../devicetree/bindings/media/i2c/imx258.yaml | 4 +- + .../bindings/media/i2c/maxim,max9286.yaml | 7 + + .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov5648.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov772x.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov8865.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov9282.yaml | 2 +- + .../devicetree/bindings/media/i2c/rda,rda5807.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx274.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx334.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx335.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx412.yaml | 2 +- + .../devicetree/bindings/media/renesas,vin.yaml | 4 +- + .../devicetree/bindings/media/ti,cal.yaml | 4 +- + .../bindings/memory-controllers/arm,pl35x-smc.yaml | 1 + + .../bindings/memory-controllers/exynos-srom.yaml | 1 + + .../intel,ixp4xx-expansion-bus-controller.yaml | 1 + + .../memory-controllers/nvidia,tegra124-emc.yaml | 1 + + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 1 + + .../devicetree/bindings/mfd/actions,atc260x.yaml | 2 +- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 6 +- + .../devicetree/bindings/mfd/mediatek,mt6357.yaml | 1 + + .../devicetree/bindings/mfd/mediatek,mt6370.yaml | 2 + + .../devicetree/bindings/mfd/ti,tps65086.yaml | 2 +- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 4 +- + .../devicetree/bindings/mmc/aspeed,sdhci.yaml | 1 + + Documentation/devicetree/bindings/mtd/mtd.yaml | 1 + + .../devicetree/bindings/net/asix,ax88796c.yaml | 2 +- + .../devicetree/bindings/net/brcm,bcmgenet.yaml | 2 - + .../bindings/net/can/microchip,mcp251xfd.yaml | 2 +- + .../bindings/net/cortina,gemini-ethernet.yaml | 6 +- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 2 +- + .../devicetree/bindings/net/mdio-gpio.yaml | 4 +- + .../bindings/net/nfc/samsung,s3fwrn5.yaml | 2 +- + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- + .../bindings/net/wireless/ti,wlcore.yaml | 10 +- + .../devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml | 2 +- + .../bindings/pci/cdns,cdns-pcie-host.yaml | 2 +- + .../devicetree/bindings/pci/cdns-pcie-ep.yaml | 8 +- + .../devicetree/bindings/pci/cdns-pcie-host.yaml | 8 +- + .../devicetree/bindings/pci/cdns-pcie.yaml | 4 +- + .../bindings/pci/intel,keembay-pcie-ep.yaml | 4 +- + .../bindings/pci/intel,keembay-pcie.yaml | 4 +- + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 2 +- + .../devicetree/bindings/pci/ti,j721e-pci-ep.yaml | 6 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 6 +- + .../phy/marvell,armada-cp110-utmi-phy.yaml | 2 +- + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 2 +- + .../bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 2 +- + .../bindings/pinctrl/pinctrl-mt8192.yaml | 2 +- + .../devicetree/bindings/pinctrl/pinmux-node.yaml | 2 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 2 +- + .../devicetree/bindings/power/supply/bq2415x.yaml | 2 +- + .../devicetree/bindings/power/supply/bq24190.yaml | 2 +- + .../devicetree/bindings/power/supply/bq24257.yaml | 4 +- + .../devicetree/bindings/power/supply/bq24735.yaml | 2 +- + .../devicetree/bindings/power/supply/bq2515x.yaml | 2 +- + .../devicetree/bindings/power/supply/bq25890.yaml | 2 +- + .../devicetree/bindings/power/supply/bq25980.yaml | 2 +- + .../devicetree/bindings/power/supply/bq27xxx.yaml | 15 +- + .../bindings/power/supply/lltc,ltc294x.yaml | 2 +- + .../bindings/power/supply/ltc4162-l.yaml | 2 +- + .../bindings/power/supply/maxim,max14656.yaml | 2 +- + .../bindings/power/supply/maxim,max17040.yaml | 4 +- + .../bindings/power/supply/maxim,max17042.yaml | 2 +- + .../bindings/power/supply/richtek,rt9455.yaml | 2 +- + .../bindings/power/supply/ti,lp8727.yaml | 3 +- + .../bindings/regulator/active-semi,act8865.yaml | 2 +- + .../regulator/google,cros-ec-regulator.yaml | 2 +- + .../bindings/regulator/nxp,pca9450-regulator.yaml | 8 +- + .../bindings/regulator/nxp,pf8x00-regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 20 +- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 6 +- + .../bindings/regulator/rohm,bd71847-regulator.yaml | 6 +- + .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 2 + + .../bindings/reserved-memory/google,open-dice.yaml | 2 +- + .../reserved-memory/nvidia,tegra210-emc-table.yaml | 2 +- + .../devicetree/bindings/reserved-memory/phram.yaml | 4 +- + .../bindings/reserved-memory/qcom,cmd-db.yaml | 6 +- + .../bindings/reserved-memory/qcom,rmtfs-mem.yaml | 6 +- + .../bindings/reserved-memory/ramoops.yaml | 6 +- + .../bindings/reserved-memory/shared-dma-pool.yaml | 2 +- + .../reset/amlogic,meson-axg-audio-arb.yaml | 4 +- + .../bindings/reset/amlogic,meson-reset.yaml | 4 +- + .../bindings/reset/bitmain,bm1880-reset.yaml | 4 +- + .../bindings/reset/brcm,bcm6345-reset.yaml | 4 +- + .../reset/brcm,bcm7216-pcie-sata-rescal.yaml | 4 +- + .../bindings/reset/brcm,brcmstb-reset.yaml | 4 +- + .../bindings/reset/marvell,berlin2-reset.yaml | 4 +- + .../devicetree/bindings/reset/microchip,rst.yaml | 6 +- + .../bindings/reset/qca,ar7100-reset.yaml | 4 +- + .../devicetree/bindings/reset/renesas,rst.yaml | 4 +- + .../devicetree/bindings/reset/sunplus,reset.yaml | 4 +- + Documentation/devicetree/bindings/rtc/snvs-rtc.txt | 1 - + .../devicetree/bindings/serial/mediatek,uart.yaml | 1 + + .../devicetree/bindings/soc/imx/fsl,imx93-src.yaml | 3 +- + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 1 + + .../devicetree/bindings/soc/renesas/renesas.yaml | 2 +- + .../devicetree/bindings/soc/ti/ti,pruss.yaml | 3 +- + .../bindings/sound/amlogic,axg-tdm-iface.yaml | 2 +- + .../devicetree/bindings/sound/everest,es8316.yaml | 2 +- + .../bindings/sound/marvell,mmp-sspa.yaml | 1 + + .../bindings/sound/qcom,lpass-rx-macro.yaml | 4 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 4 +- + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wcd934x.yaml | 1 + + .../devicetree/bindings/sound/samsung,odroid.yaml | 2 + + .../devicetree/bindings/sound/simple-card.yaml | 24 +- + .../devicetree/bindings/sound/tas2562.yaml | 2 +- + .../devicetree/bindings/sound/tas2770.yaml | 2 +- + .../devicetree/bindings/sound/tas27xx.yaml | 2 +- + .../devicetree/bindings/sound/tas5805m.yaml | 2 +- + .../devicetree/bindings/sound/tlv320adcx140.yaml | 2 +- + .../devicetree/bindings/sound/zl38060.yaml | 2 +- + .../bindings/soundwire/qcom,soundwire.yaml | 1 + + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 1 + + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + + .../bindings/spi/microchip,mpfs-spi.yaml | 2 +- + .../devicetree/bindings/spi/spi-controller.yaml | 1 + + .../sram/allwinner,sun4i-a10-system-control.yaml | 10 +- + .../devicetree/bindings/sram/qcom,ocmem.yaml | 1 + + .../devicetree/bindings/thermal/thermal-zones.yaml | 1 + + .../bindings/timer/amlogic,meson6-timer.txt | 22 - + .../bindings/timer/amlogic,meson6-timer.yaml | 54 ++ + .../devicetree/bindings/usb/maxim,max33359.yaml | 2 +- + .../devicetree/bindings/usb/maxim,max3420-udc.yaml | 2 +- + .../bindings/usb/mediatek,mt6360-tcpc.yaml | 2 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 1 + + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 2 +- + .../devicetree/bindings/usb/richtek,rt1719.yaml | 2 +- + .../devicetree/bindings/usb/st,stusb160x.yaml | 2 +- + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 2 +- + .../devicetree/bindings/usb/ti,tps6598x.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 +- + .../devicetree/bindings/watchdog/apple,wdt.yaml | 2 +- + .../devicetree/bindings/watchdog/arm-smc-wdt.yaml | 2 +- + .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 2 +- + .../bindings/watchdog/brcm,bcm7038-wdt.yaml | 2 +- + .../bindings/watchdog/faraday,ftwdt010.yaml | 2 +- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 2 +- + .../bindings/watchdog/maxim,max63xx.yaml | 2 +- + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 2 +- + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 2 +- + .../bindings/watchdog/socionext,uniphier-wdt.yaml | 2 +- + .../bindings/watchdog/st,stm32-iwdg.yaml | 2 +- + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 2 +- + MAINTAINERS | 4 +- + arch/arm/kernel/cpuidle.c | 1 - + arch/arm/mach-sunxi/mc_smp.c | 1 - + arch/riscv/kernel/cacheinfo.c | 1 - + arch/riscv/kernel/setup.c | 2 +- + arch/sparc/include/asm/prom.h | 3 + + drivers/base/cacheinfo.c | 2 +- + drivers/bus/uniphier-system-bus.c | 54 +- + drivers/clocksource/ingenic-timer.c | 3 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 - + drivers/cpufreq/kirkwood-cpufreq.c | 2 +- + drivers/cpufreq/maple-cpufreq.c | 2 +- + drivers/cpufreq/pmac32-cpufreq.c | 2 +- + drivers/cpufreq/pmac64-cpufreq.c | 2 +- + drivers/cpufreq/qcom-cpufreq-hw.c | 4 +- + drivers/cpufreq/spear-cpufreq.c | 2 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 3 +- + drivers/cpufreq/tegra124-cpufreq.c | 1 - + drivers/cpufreq/tegra20-cpufreq.c | 2 +- + drivers/cpuidle/cpuidle-psci.c | 1 - + drivers/cpuidle/cpuidle-qcom-spm.c | 3 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 2 +- + drivers/cpuidle/dt_idle_states.c | 1 - + drivers/irqchip/irq-loongson-eiointc.c | 5 +- + drivers/of/Makefile | 2 +- + drivers/of/address.c | 347 +++++++------ + drivers/of/base.c | 187 ------- + drivers/of/cpu.c | 210 ++++++++ + drivers/of/of_private.h | 1 + + drivers/of/unittest-data/tests-address.dtsi | 9 +- + drivers/of/unittest.c | 171 ++++++- + drivers/opp/of.c | 2 +- + drivers/soc/mediatek/mtk-svs.c | 1 + + drivers/thermal/cpuidle_cooling.c | 3 +- + include/linux/cpufreq.h | 1 - + include/linux/of.h | 32 +- + include/linux/of_address.h | 31 ++ + include/linux/of_device.h | 29 +- + include/linux/of_platform.h | 10 +- + 290 files changed, 2008 insertions(+), 1650 deletions(-) + rename Documentation/devicetree/bindings/{memory-controllers => cache}/baikal,bt1-l2-ctl.yaml (95%) + rename Documentation/devicetree/bindings/{powerpc/fsl/l2cache.txt => cache/freescale-l2cache.txt} (100%) + rename Documentation/devicetree/bindings/{arm => cache}/l2c2x0.yaml (99%) + rename Documentation/devicetree/bindings/{arm/mrvl/feroceon.txt => cache/marvell,feroceon-cache.txt} (100%) + rename Documentation/devicetree/bindings/{arm/mrvl/tauros2.txt => cache/marvell,tauros2-cache.txt} (100%) + rename Documentation/devicetree/bindings/{arm/msm => cache}/qcom,llcc.yaml (98%) + rename Documentation/devicetree/bindings/{riscv => cache}/sifive,ccache0.yaml (98%) + rename Documentation/devicetree/bindings/{arm/socionext => cache}/socionext,uniphier-system-cache.yaml (96%) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl,sec-v4.0-mon.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/parade,ps8622.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/ps8622.txt + delete mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/toshiba,tc358764.yaml + delete mode 100644 Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt + delete mode 100644 Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,fpga-slave-serial.yaml + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,pr-decoupler.yaml + delete mode 100644 Documentation/devicetree/bindings/input/snvs-pwrkey.txt + delete mode 100644 Documentation/devicetree/bindings/iommu/qcom,iommu.txt + create mode 100644 Documentation/devicetree/bindings/iommu/qcom,iommu.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/snvs-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/amlogic,meson6-timer.yaml + create mode 100644 drivers/of/cpu.c +$ git am -3 ../patches/0001-devicetree-fix-up-for-include-rationalisation.patch +Applying: devicetree: fix up for include rationalisation +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/cpufreq/acpi-cpufreq.c +M drivers/cpufreq/pcc-cpufreq.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master a3eff73ff7f90] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git + Date: Fri Apr 14 14:41:43 2023 +0100 +$ git am -3 ../patches/0001-of-address-fixup-for-Add-of_property_read_reg-helper.patch +Applying: of/address: fixup for "Add of_property_read_reg() helper" +Using index info to reconstruct a base tree... +M include/linux/of_address.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging dt-krzk/for-next (936f3b6478b7b Merge branch 'next/qcom-pinctrl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/qcom,ipq5332-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,msm8909-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,qdu1000-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,sc8180x-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sdm670-tlmm.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,sdx65-tlmm.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,sm6115-tlmm.yaml | 10 +--------- + .../devicetree/bindings/pinctrl/qcom,sm6125-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sm6350-tlmm.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,sm6375-tlmm.yaml | 12 +----------- + .../devicetree/bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sm8350-tlmm.yaml | 13 +------------ + .../devicetree/bindings/pinctrl/qcom,sm8450-tlmm.yaml | 11 +---------- + .../devicetree/bindings/pinctrl/qcom,sm8550-tlmm.yaml | 11 +---------- + 36 files changed, 36 insertions(+), 362 deletions(-) +Merging mailbox/mailbox-for-next (6ccbe33a39523 dt-bindings: mailbox: qcom-ipcc: Add compatible for QDU1000/QRU1000) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (3ac07d0bc5664 Merge remote-tracking branch 'spi/for-6.4' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging drivers/spi/spi.c +Auto-merging drivers/net/ieee802154/ca8210.c +Auto-merging arch/powerpc/platforms/83xx/mpc832x_rdb.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/amlogic,a1-spifc.yaml | 41 ++ + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 37 +- + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 23 +- + Documentation/spi/spi-summary.rst | 23 +- + MAINTAINERS | 2 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- + drivers/iio/imu/adis16400.c | 2 +- + drivers/mtd/devices/mtd_dataflash.c | 2 +- + drivers/net/ethernet/adi/adin1110.c | 2 +- + drivers/net/ethernet/asix/ax88796c_main.c | 2 +- + drivers/net/ethernet/davicom/dm9051.c | 2 +- + drivers/net/ethernet/qualcomm/qca_debug.c | 2 +- + drivers/net/ieee802154/ca8210.c | 2 +- + drivers/net/wan/slic_ds26522.c | 2 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 2 +- + drivers/net/wireless/silabs/wfx/bus_spi.c | 2 +- + drivers/net/wireless/st/cw1200/cw1200_spi.c | 2 +- + drivers/platform/x86/serial-multi-instantiate.c | 3 +- + drivers/spi/Kconfig | 17 +- + drivers/spi/Makefile | 1 + + drivers/spi/atmel-quadspi.c | 36 +- + drivers/spi/spi-altera-core.c | 2 +- + drivers/spi/spi-amd.c | 4 +- + drivers/spi/spi-amlogic-spifc-a1.c | 456 +++++++++++++++++++++ + drivers/spi/spi-ar934x.c | 8 +- + drivers/spi/spi-armada-3700.c | 10 +- + drivers/spi/spi-aspeed-smc.c | 18 +- + drivers/spi/spi-at91-usart.c | 8 +- + drivers/spi/spi-ath79.c | 10 +- + drivers/spi/spi-atmel.c | 32 +- + drivers/spi/spi-au1550.c | 9 +- + drivers/spi/spi-axi-spi-engine.c | 8 +- + drivers/spi/spi-bcm-qspi.c | 12 +- + drivers/spi/spi-bcm2835.c | 36 +- + drivers/spi/spi-bcm2835aux.c | 10 +- + drivers/spi/spi-bcm63xx-hsspi.c | 36 +- + drivers/spi/spi-bcm63xx.c | 18 +- + drivers/spi/spi-bcmbca-hsspi.c | 36 +- + drivers/spi/spi-brcmstb-qspi.c | 6 +- + drivers/spi/spi-cadence-quadspi.c | 32 +- + drivers/spi/spi-cadence-xspi.c | 4 +- + drivers/spi/spi-cadence.c | 10 +- + drivers/spi/spi-cavium-octeon.c | 6 +- + drivers/spi/spi-cavium.c | 8 +- + drivers/spi/spi-coldfire-qspi.c | 14 +- + drivers/spi/spi-davinci.c | 23 +- + drivers/spi/spi-dln2.c | 12 +- + drivers/spi/spi-dw-bt1.c | 6 +- + drivers/spi/spi-dw-core.c | 2 +- + drivers/spi/spi-dw-mmio.c | 10 +- + drivers/spi/spi-ep93xx.c | 6 +- + drivers/spi/spi-falcon.c | 2 +- + drivers/spi/spi-fsi.c | 2 +- + drivers/spi/spi-fsl-cpm.c | 23 ++ + drivers/spi/spi-fsl-dspi.c | 24 +- + drivers/spi/spi-fsl-espi.c | 12 +- + drivers/spi/spi-fsl-lpspi.c | 7 +- + drivers/spi/spi-fsl-qspi.c | 12 +- + drivers/spi/spi-fsl-spi.c | 92 ++--- + drivers/spi/spi-geni-qcom.c | 11 +- + drivers/spi/spi-gpio.c | 4 +- + drivers/spi/spi-gxp.c | 4 +- + drivers/spi/spi-hisi-kunpeng.c | 6 +- + drivers/spi/spi-hisi-sfc-v3xx.c | 2 +- + drivers/spi/spi-img-spfi.c | 20 +- + drivers/spi/spi-imx.c | 75 ++-- + drivers/spi/spi-ingenic.c | 4 +- + drivers/spi/spi-intel-pci.c | 1 + + drivers/spi/spi-intel.c | 2 +- + drivers/spi/spi-iproc-qspi.c | 6 +- + drivers/spi/spi-jcore.c | 4 +- + drivers/spi/spi-lantiq-ssc.c | 12 +- + drivers/spi/spi-loopback-test.c | 8 + + drivers/spi/spi-mem.c | 4 +- + drivers/spi/spi-meson-spicc.c | 8 +- + drivers/spi/spi-meson-spifc.c | 6 +- + drivers/spi/spi-microchip-core-qspi.c | 6 +- + drivers/spi/spi-microchip-core.c | 12 +- + drivers/spi/spi-mpc512x-psc.c | 142 ++----- + drivers/spi/spi-mpc52xx-psc.c | 145 ++----- + drivers/spi/spi-mpc52xx.c | 8 +- + drivers/spi/spi-mt65xx.c | 6 +- + drivers/spi/spi-mt7621.c | 2 +- + drivers/spi/spi-mtk-nor.c | 6 +- + drivers/spi/spi-mtk-snfi.c | 5 +- + drivers/spi/spi-mux.c | 8 +- + drivers/spi/spi-mxic.c | 16 +- + drivers/spi/spi-mxs.c | 8 +- + drivers/spi/spi-npcm-fiu.c | 25 +- + drivers/spi/spi-npcm-pspi.c | 6 +- + drivers/spi/spi-nxp-fspi.c | 74 +++- + drivers/spi/spi-oc-tiny.c | 5 +- + drivers/spi/spi-omap-uwire.c | 13 +- + drivers/spi/spi-omap2-mcspi.c | 35 +- + drivers/spi/spi-orion.c | 13 +- + drivers/spi/spi-pci1xxxx.c | 22 +- + drivers/spi/spi-pic32-sqi.c | 8 +- + drivers/spi/spi-pic32.c | 13 +- + drivers/spi/spi-pl022.c | 4 +- + drivers/spi/spi-ppc4xx.c | 5 +- + drivers/spi/spi-pxa2xx.c | 14 +- + drivers/spi/spi-qcom-qspi.c | 13 +- + drivers/spi/spi-qup.c | 31 +- + drivers/spi/spi-rb4xx.c | 8 +- + drivers/spi/spi-rockchip-sfc.c | 12 +- + drivers/spi/spi-rockchip.c | 36 +- + drivers/spi/spi-rpc-if.c | 6 +- + drivers/spi/spi-rspi.c | 24 +- + drivers/spi/spi-s3c64xx.c | 8 +- + drivers/spi/spi-sc18is602.c | 6 +- + drivers/spi/spi-sh-hspi.c | 6 +- + drivers/spi/spi-sh-msiof.c | 13 +- + drivers/spi/spi-sh-sci.c | 7 +- + drivers/spi/spi-sh.c | 6 +- + drivers/spi/spi-sifive.c | 12 +- + drivers/spi/spi-slave-mt27xx.c | 6 +- + drivers/spi/spi-sn-f-ospi.c | 10 +- + drivers/spi/spi-sprd-adi.c | 8 +- + drivers/spi/spi-sprd.c | 23 +- + drivers/spi/spi-st-ssc4.c | 8 +- + drivers/spi/spi-stm32-qspi.c | 18 +- + drivers/spi/spi-stm32.c | 15 +- + drivers/spi/spi-sun4i.c | 8 +- + drivers/spi/spi-sun6i.c | 7 +- + drivers/spi/spi-sunplus-sp7021.c | 5 +- + drivers/spi/spi-synquacer.c | 12 +- + drivers/spi/spi-tegra114.c | 37 +- + drivers/spi/spi-tegra20-sflash.c | 8 +- + drivers/spi/spi-tegra20-slink.c | 11 +- + drivers/spi/spi-tegra210-quad.c | 17 +- + drivers/spi/spi-ti-qspi.c | 16 +- + drivers/spi/spi-topcliff-pch.c | 10 +- + drivers/spi/spi-uniphier.c | 6 +- + drivers/spi/spi-wpcm-fiu.c | 12 +- + drivers/spi/spi-xcomm.c | 2 +- + drivers/spi/spi-xilinx.c | 15 +- + drivers/spi/spi-xlp.c | 4 +- + drivers/spi/spi-xtensa-xtfpga.c | 6 +- + drivers/spi/spi-zynq-qspi.c | 8 +- + drivers/spi/spi-zynqmp-gqspi.c | 8 +- + drivers/spi/spi.c | 102 +++-- + drivers/spi/spidev.c | 6 +- + drivers/staging/fbtft/fbtft-core.c | 2 +- + drivers/staging/greybus/spilib.c | 2 +- + include/linux/platform_data/spi-s3c64xx.h | 1 + + include/linux/spi/spi.h | 20 +- + include/trace/events/spi.h | 10 +- + sound/pci/hda/cs35l41_hda_spi.c | 2 +- + 148 files changed, 1495 insertions(+), 1129 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/amlogic,a1-spifc.yaml + create mode 100644 drivers/spi/spi-amlogic-spifc-a1.c +Merging tip/master (0ff5efe3f93f6 Merge x86/microcode into tip/master) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Removing tools/include/linux/objtool.h +Auto-merging mm/util.c +Auto-merging mm/userfaultfd.c +CONFLICT (content): Merge conflict in mm/userfaultfd.c +Auto-merging mm/nommu.c +Auto-merging mm/mprotect.c +Auto-merging mm/mmap.c +Auto-merging mm/migrate.c +Auto-merging mm/memory.c +Auto-merging mm/madvise.c +Auto-merging mm/internal.h +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/gup.c +Auto-merging mm/debug_vm_pgtable.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/livepatch/core.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/main.c +Auto-merging include/linux/sched/mm.h +CONFLICT (content): Merge conflict in include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/pgtable.h +Auto-merging include/linux/mm.h +CONFLICT (modify/delete): include/linux/ioasid.h deleted in HEAD and modified in tip/master. Version tip/master of include/linux/ioasid.h left in tree. +Auto-merging fs/proc/task_mmu.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/iommu/iommu-sva.c +CONFLICT (content): Merge conflict in drivers/iommu/iommu-sva.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc.c +Auto-merging drivers/gpu/drm/i915/gt/selftest_timeline.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rps.c +Auto-merging drivers/gpu/drm/i915/gt/intel_rc6.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_rc6.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_pm.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/crypto/ccp/sev-dev.c +Auto-merging arch/x86/mm/tlb.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kernel/ftrace_64.S +Auto-merging arch/x86/kernel/cpu/resctrl/monitor.c +Auto-merging arch/x86/kernel/cpu/microcode/amd.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/entry/entry_64.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/s390/mm/pageattr.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/mips/loongson64/smp.c +Auto-merging arch/mips/kernel/uprobes.c +Auto-merging arch/mips/kernel/smp-cps.c +CONFLICT (modify/delete): arch/mips/kernel/rtlx-cmp.c deleted in HEAD and modified in tip/master. Version tip/master of arch/mips/kernel/rtlx-cmp.c left in tree. +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/m68k/include/asm/mcf_pgtable.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging MAINTAINERS +Auto-merging Documentation/mm/arch_pgtable_helpers.rst +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'drivers/gpu/drm/i915/gt/intel_rc6.c' using previous resolution. +Resolved 'drivers/iommu/iommu-sva.c' using previous resolution. +Resolved 'include/linux/sched/mm.h' using previous resolution. +Resolved 'mm/userfaultfd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f include/linux/ioasid.h +rm 'include/linux/ioasid.h' +$ git commit --no-edit -v -a +[master 7a1a1908257e6] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/accounting/psi.rst | 4 + + Documentation/admin-guide/kernel-parameters.txt | 17 +- + Documentation/arch/x86/index.rst | 1 + + Documentation/arch/x86/microcode.rst | 10 + + Documentation/arch/x86/xstate.rst | 100 ++ + Documentation/filesystems/proc.rst | 1 + + Documentation/livepatch/reliable-stacktrace.rst | 2 +- + Documentation/mm/arch_pgtable_helpers.rst | 9 +- + Documentation/virt/coco/sev-guest.rst | 20 +- + Documentation/x86/shstk.rst | 179 +++ + MAINTAINERS | 13 +- + arch/alpha/include/asm/cmpxchg.h | 10 +- + arch/alpha/include/asm/local.h | 12 +- + arch/alpha/include/asm/pgtable.h | 6 +- + arch/alpha/kernel/process.c | 4 +- + arch/alpha/kernel/smp.c | 2 +- + arch/arc/include/asm/cmpxchg.h | 4 +- + arch/arc/include/asm/hugepage.h | 2 +- + arch/arc/include/asm/pgtable-bits-arcv2.h | 7 +- + arch/arc/kernel/smp.c | 2 +- + arch/arm/include/asm/cmpxchg.h | 7 +- + arch/arm/include/asm/pgtable-3level.h | 7 +- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm/kernel/smp.c | 7 +- + arch/arm/mach-actions/platsmp.c | 2 + + arch/arm/probes/uprobes/core.c | 8 +- + arch/arm/vdso/Makefile | 4 +- + arch/arm64/include/asm/cmpxchg.h | 7 +- + arch/arm64/include/asm/mmu_context.h | 6 + + arch/arm64/include/asm/pgtable.h | 9 +- + arch/arm64/include/asm/smp.h | 2 +- + arch/arm64/kernel/probes/uprobes.c | 9 +- + arch/arm64/kernel/process.c | 2 +- + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/signal32.c | 2 +- + arch/arm64/kernel/smp.c | 5 +- + arch/arm64/kernel/vdso/Makefile | 4 +- + arch/arm64/kernel/vdso32/Makefile | 3 - + arch/arm64/mm/trans_pgd.c | 4 +- + arch/csky/include/asm/pgtable.h | 2 +- + arch/csky/kernel/probes/uprobes.c | 9 +- + arch/csky/kernel/smp.c | 6 +- + arch/csky/kernel/vdso/Makefile | 4 +- + arch/hexagon/include/asm/cmpxchg.h | 10 +- + arch/hexagon/include/asm/pgtable.h | 2 +- + arch/hexagon/kernel/smp.c | 2 +- + arch/ia64/include/asm/cmpxchg.h | 2 +- + arch/ia64/include/asm/pgtable.h | 2 +- + arch/ia64/include/uapi/asm/cmpxchg.h | 4 +- + arch/ia64/kernel/process.c | 6 +- + arch/ia64/kernel/smp.c | 4 +- + arch/loongarch/include/asm/cmpxchg.h | 4 +- + arch/loongarch/include/asm/local.h | 13 +- + arch/loongarch/include/asm/pgtable.h | 4 +- + arch/loongarch/include/asm/smp.h | 2 +- + arch/loongarch/kernel/process.c | 2 +- + arch/loongarch/kernel/smp.c | 6 +- + arch/loongarch/vdso/Makefile | 4 +- + arch/m68k/include/asm/cmpxchg.h | 6 +- + arch/m68k/include/asm/mcf_pgtable.h | 2 +- + arch/m68k/include/asm/motorola_pgtable.h | 6 +- + arch/m68k/include/asm/sun3_pgtable.h | 6 +- + arch/microblaze/include/asm/pgtable.h | 2 +- + arch/mips/cavium-octeon/smp.c | 1 + + arch/mips/include/asm/cmpxchg.h | 4 +- + arch/mips/include/asm/local.h | 13 +- + arch/mips/include/asm/pgtable.h | 6 +- + arch/mips/include/asm/smp.h | 4 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/smp-bmips.c | 4 + + arch/mips/kernel/smp-cps.c | 1 + + arch/mips/kernel/uprobes.c | 10 +- + arch/mips/loongson64/smp.c | 2 + + arch/mips/vdso/Makefile | 4 +- + arch/nios2/include/asm/pgtable.h | 2 +- + arch/openrisc/include/asm/cmpxchg.h | 10 +- + arch/openrisc/include/asm/pgtable.h | 2 +- + arch/openrisc/kernel/smp.c | 2 +- + arch/parisc/include/asm/cmpxchg.h | 4 +- + arch/parisc/include/asm/pgtable.h | 6 +- + arch/parisc/kernel/process.c | 2 +- + arch/parisc/kernel/smp.c | 4 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 4 +- + arch/powerpc/include/asm/cmpxchg.h | 4 +- + arch/powerpc/include/asm/local.h | 11 + + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 2 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/kernel/smp.c | 8 +- + arch/powerpc/kernel/uprobes.c | 10 +- + arch/powerpc/kernel/vdso/Makefile | 2 +- + arch/powerpc/kvm/book3s_hv.c | 3 + + arch/powerpc/platforms/powernv/subcore.c | 2 + + arch/riscv/include/asm/atomic.h | 2 +- + arch/riscv/include/asm/cmpxchg.h | 4 +- + arch/riscv/include/asm/pgtable.h | 6 +- + arch/riscv/kernel/cpu-hotplug.c | 2 +- + arch/riscv/kernel/probes/uprobes.c | 9 +- + arch/riscv/kernel/smp.c | 4 +- + arch/riscv/kernel/vdso/Makefile | 4 +- + arch/s390/include/asm/cmpxchg.h | 8 +- + arch/s390/include/asm/hugetlb.h | 4 +- + arch/s390/include/asm/pgtable.h | 14 +- + arch/s390/kernel/idle.c | 2 +- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/uprobes.c | 7 +- + arch/s390/kernel/vdso32/Makefile | 3 +- + arch/s390/kernel/vdso64/Makefile | 3 +- + arch/s390/mm/pageattr.c | 4 +- + arch/sh/include/asm/cmpxchg.h | 4 +- + arch/sh/include/asm/pgtable_32.h | 10 +- + arch/sh/include/asm/smp-ops.h | 5 +- + arch/sh/kernel/idle.c | 3 +- + arch/sh/kernel/smp.c | 2 +- + arch/sparc/include/asm/cmpxchg_32.h | 4 +- + arch/sparc/include/asm/cmpxchg_64.h | 6 +- + arch/sparc/include/asm/mmu_context_64.h | 6 + + arch/sparc/include/asm/pgtable_32.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 6 +- + arch/sparc/include/asm/smp_64.h | 2 +- + arch/sparc/include/asm/uaccess_64.h | 2 + + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/signal32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/sparc/kernel/smp_32.c | 2 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/sparc/kernel/uprobes.c | 7 +- + arch/um/include/asm/pgtable.h | 2 +- + arch/x86/Kconfig | 35 + + arch/x86/Kconfig.assembler | 5 + + arch/x86/boot/compressed/ident_map_64.c | 8 - + arch/x86/boot/compressed/misc.h | 9 + + arch/x86/boot/compressed/sev.c | 2 - + arch/x86/boot/compressed/tdx.c | 4 +- + arch/x86/coco/core.c | 53 +- + arch/x86/coco/tdx/tdcall.S | 66 +- + arch/x86/coco/tdx/tdx.c | 18 +- + arch/x86/entry/entry_64.S | 28 +- + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/entry/vdso/Makefile | 5 +- + arch/x86/entry/vdso/vdso32-setup.c | 11 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/events/intel/core.c | 16 +- + arch/x86/events/intel/cstate.c | 2 + + arch/x86/events/msr.c | 2 + + arch/x86/hyperv/hv_init.c | 11 - + arch/x86/hyperv/ivm.c | 142 ++- + arch/x86/include/asm/cmpxchg.h | 6 + + arch/x86/include/asm/coco.h | 24 +- + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/disabled-features.h | 24 +- + arch/x86/include/asm/fpu/api.h | 9 + + arch/x86/include/asm/fpu/regset.h | 7 +- + arch/x86/include/asm/fpu/sched.h | 3 +- + arch/x86/include/asm/fpu/types.h | 16 +- + arch/x86/include/asm/fpu/xstate.h | 6 +- + arch/x86/include/asm/idtentry.h | 2 +- + arch/x86/include/asm/intel-mid.h | 21 - + arch/x86/include/asm/local.h | 13 +- + arch/x86/include/asm/mem_encrypt.h | 1 + + arch/x86/include/asm/mmu.h | 18 +- + arch/x86/include/asm/mmu_context.h | 62 +- + arch/x86/include/asm/mshyperv.h | 16 +- + arch/x86/include/asm/nospec-branch.h | 14 +- + arch/x86/include/asm/orc_types.h | 12 +- + arch/x86/include/asm/paravirt.h | 14 +- + arch/x86/include/asm/paravirt_types.h | 15 +- + arch/x86/include/asm/pgtable.h | 322 ++++- + arch/x86/include/asm/pgtable_types.h | 56 +- + arch/x86/include/asm/processor-flags.h | 2 + + arch/x86/include/asm/processor.h | 14 +- + arch/x86/include/asm/realmode.h | 1 - + arch/x86/include/asm/sev-common.h | 4 - + arch/x86/include/asm/sev.h | 10 +- + arch/x86/include/asm/shared/tdx.h | 5 +- + arch/x86/include/asm/shstk.h | 38 + + arch/x86/include/asm/smp.h | 10 +- + arch/x86/include/asm/special_insns.h | 13 + + arch/x86/include/asm/tlbflush.h | 51 +- + arch/x86/include/asm/trap_pf.h | 2 + + arch/x86/include/asm/traps.h | 12 + + arch/x86/include/asm/uaccess.h | 58 +- + arch/x86/include/asm/uaccess_64.h | 2 - + arch/x86/include/asm/unwind_hints.h | 18 +- + arch/x86/include/asm/x86_init.h | 4 + + arch/x86/include/uapi/asm/mman.h | 4 + + arch/x86/include/uapi/asm/prctl.h | 20 + + arch/x86/include/uapi/asm/processor-flags.h | 6 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/acpi/boot.c | 11 +- + arch/x86/kernel/acpi/sleep.c | 23 +- + arch/x86/kernel/apic/apic.c | 5 +- + arch/x86/kernel/apic/io_apic.c | 24 +- + arch/x86/kernel/apic/x2apic_cluster.c | 126 +- + arch/x86/kernel/asm-offsets.c | 1 + + arch/x86/kernel/cet.c | 152 +++ + arch/x86/kernel/cpu/amd.c | 11 + + arch/x86/kernel/cpu/bugs.c | 10 +- + arch/x86/kernel/cpu/common.c | 36 +- + arch/x86/kernel/cpu/cpu.h | 8 + + arch/x86/kernel/cpu/cpuid-deps.c | 1 + + arch/x86/kernel/cpu/intel.c | 59 +- + arch/x86/kernel/cpu/mce/amd.c | 16 +- + arch/x86/kernel/cpu/mce/internal.h | 10 +- + arch/x86/kernel/cpu/microcode/amd.c | 9 +- + arch/x86/kernel/cpu/microcode/core.c | 9 +- + arch/x86/kernel/cpu/mshyperv.c | 15 +- + arch/x86/kernel/cpu/proc.c | 23 + + arch/x86/kernel/cpu/resctrl/monitor.c | 43 +- + arch/x86/kernel/fpu/core.c | 54 +- + arch/x86/kernel/fpu/regset.c | 81 ++ + arch/x86/kernel/fpu/xstate.c | 90 +- + arch/x86/kernel/ftrace_64.S | 2 +- + arch/x86/kernel/head_64.S | 89 +- + arch/x86/kernel/idt.c | 2 +- + arch/x86/kernel/itmt.c | 11 +- + arch/x86/kernel/paravirt.c | 30 +- + arch/x86/kernel/process.c | 32 +- + arch/x86/kernel/process_64.c | 76 +- + arch/x86/kernel/ptrace.c | 12 + + arch/x86/kernel/relocate_kernel_64.S | 10 +- + arch/x86/kernel/sev.c | 15 +- + arch/x86/kernel/shstk.c | 499 ++++++++ + arch/x86/kernel/signal.c | 1 + + arch/x86/kernel/signal_32.c | 2 +- + arch/x86/kernel/signal_64.c | 8 +- + arch/x86/kernel/smpboot.c | 30 +- + arch/x86/kernel/sys_x86_64.c | 6 +- + arch/x86/kernel/traps.c | 93 +- + arch/x86/kernel/unwind_orc.c | 27 +- + arch/x86/kernel/x86_init.c | 2 + + arch/x86/kvm/svm/svm.c | 4 + + arch/x86/kvm/x86.c | 2 + + arch/x86/lib/getuser.S | 83 +- + arch/x86/lib/putuser.S | 54 +- + arch/x86/lib/retpoline.S | 6 +- + arch/x86/lib/usercopy_64.c | 9 - + arch/x86/mm/fault.c | 22 + + arch/x86/mm/init.c | 7 +- + arch/x86/mm/ioremap.c | 5 + + arch/x86/mm/mem_encrypt_amd.c | 10 +- + arch/x86/mm/pat/set_memory.c | 7 +- + arch/x86/mm/pgtable.c | 38 + + arch/x86/mm/tlb.c | 53 +- + arch/x86/platform/pvh/head.S | 2 +- + arch/x86/xen/enlighten_pv.c | 2 +- + arch/x86/xen/mmu_pv.c | 14 +- + arch/x86/xen/xen-asm.S | 6 +- + arch/x86/xen/xen-head.S | 6 +- + arch/xtensa/include/asm/cmpxchg.h | 4 +- + arch/xtensa/include/asm/pgtable.h | 2 +- + arch/xtensa/include/asm/smp.h | 2 +- + arch/xtensa/kernel/smp.c | 6 +- + drivers/crypto/ccp/sev-dev.c | 22 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gsc.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 6 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 1 + + drivers/hv/ring_buffer.c | 2 +- + drivers/hv/vmbus_drv.c | 1 - + drivers/iommu/iommu-sva.c | 12 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + drivers/vhost/vhost.c | 3 +- + drivers/virt/coco/sev-guest/sev-guest.c | 99 +- + fs/aio.c | 2 +- + fs/proc/array.c | 13 + + fs/proc/task_mmu.c | 12 +- + include/asm-generic/hugetlb.h | 4 +- + include/asm-generic/local.h | 1 + + include/asm-generic/local64.h | 12 +- + include/asm-generic/mshyperv.h | 2 + + include/linux/atomic/atomic-arch-fallback.h | 24 +- + include/linux/atomic/atomic-instrumented.h | 20 +- + include/linux/cpu.h | 2 +- + include/linux/livepatch.h | 1 + + include/linux/livepatch_sched.h | 29 + + include/linux/llist.h | 6 +- + include/linux/mm.h | 76 +- + include/linux/mman.h | 4 + + include/linux/mmu_context.h | 14 + + include/linux/non-atomic/xchg.h | 19 + + include/linux/objtool.h | 81 +- + include/linux/objtool_types.h | 57 + + include/linux/pgtable.h | 14 + + include/linux/proc_fs.h | 2 + + include/linux/psi.h | 2 +- + include/linux/psi_types.h | 43 +- + include/linux/sched.h | 20 +- + include/linux/smp.h | 11 +- + include/linux/syscalls.h | 1 + + include/linux/uaccess.h | 22 + + include/trace/events/ipi.h | 44 + + include/uapi/asm-generic/siginfo.h | 3 +- + include/uapi/asm-generic/unistd.h | 2 +- + include/uapi/linux/elf.h | 2 + + include/uapi/linux/psp-sev.h | 7 + + include/uapi/linux/sev-guest.h | 18 +- + init/main.c | 19 +- + ipc/shm.c | 2 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/irq_work.c | 12 +- + kernel/livepatch/core.c | 1 + + kernel/livepatch/transition.c | 122 +- + kernel/locking/rwbase_rt.c | 9 - + kernel/sched/core.c | 168 ++- + kernel/sched/deadline.c | 10 + + kernel/sched/fair.c | 32 +- + kernel/sched/idle.c | 2 +- + kernel/sched/psi.c | 473 ++++---- + kernel/sched/rt.c | 19 + + kernel/sched/sched.h | 4 + + kernel/sched/smp.h | 2 +- + kernel/sched/topology.c | 4 +- + kernel/smp.c | 313 ++--- + kernel/sys_ni.c | 1 + + lib/Kconfig.debug | 9 + + lib/vdso/Makefile | 13 +- + mm/debug_vm_pgtable.c | 16 +- + mm/gup.c | 6 +- + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 4 +- + mm/internal.h | 4 +- + mm/madvise.c | 5 +- + mm/memory.c | 5 +- + mm/migrate.c | 11 +- + mm/migrate_device.c | 2 +- + mm/mmap.c | 10 +- + mm/mprotect.c | 2 +- + mm/nommu.c | 4 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 2 +- + scripts/atomic/gen-atomic-fallback.sh | 4 + + scripts/atomic/gen-atomic-instrumented.sh | 2 +- + scripts/sorttable.h | 2 +- + tools/arch/x86/include/asm/orc_types.h | 12 +- + tools/arch/x86/kcpuid/cpuid.csv | 61 +- + tools/arch/x86/kcpuid/kcpuid.c | 32 +- + tools/include/linux/objtool.h | 200 ---- + tools/include/linux/objtool_types.h | 57 + + tools/objtool/check.c | 70 +- + tools/objtool/include/objtool/check.h | 4 +- + tools/objtool/orc_dump.c | 15 +- + tools/objtool/orc_gen.c | 43 +- + tools/objtool/sync-check.sh | 2 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/lam.c | 1241 ++++++++++++++++++++ + tools/testing/selftests/x86/test_shadow_stack.c | 695 +++++++++++ + virt/kvm/kvm_main.c | 3 + + 364 files changed, 6679 insertions(+), 2184 deletions(-) + create mode 100644 Documentation/x86/shstk.rst + create mode 100644 arch/x86/include/asm/shstk.h + create mode 100644 arch/x86/kernel/cet.c + create mode 100644 arch/x86/kernel/shstk.c + create mode 100644 include/linux/livepatch_sched.h + create mode 100644 include/linux/non-atomic/xchg.h + create mode 100644 include/linux/objtool_types.h + delete mode 100644 tools/include/linux/objtool.h + create mode 100644 tools/include/linux/objtool_types.h + create mode 100644 tools/testing/selftests/x86/lam.c + create mode 100644 tools/testing/selftests/x86/test_shadow_stack.c +$ git am -3 ../patches/0001-fixup-for-iommu-sva-Replace-pasid_valid-helper-with-.patch +Applying: fixup for "iommu/sva: Replace pasid_valid() helper with mm_valid_pasid()" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/iommu.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 58fd974b8b4db] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Fri Apr 14 14:46:57 2023 +0100 +$ git am -3 ../patches/0001-extra-fixup-for-iommu-sva-Replace-pasid_valid-helper.patch +Applying: extra fixup for "iommu/sva: Replace pasid_valid() helper with mm_valid_pasid()" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/process_64.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 981724dfec18a] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Fri Apr 14 14:46:57 2023 +0100 +Merging clockevents/timers/drivers/next (6bc2e2a00f468 clocksource/drivers/stm32-lp: Drop of_match_ptr for ID table) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging drivers/clocksource/timer-ti-dm.c +Auto-merging drivers/clocksource/timer-tegra186.c +Auto-merging drivers/clocksource/timer-stm32-lp.c +Auto-merging drivers/clocksource/sh_mtu2.c +Merge made by the 'recursive' strategy. + drivers/clocksource/Kconfig | 9 ++ + drivers/clocksource/Makefile | 1 + + drivers/clocksource/exynos_mct.c | 2 +- + drivers/clocksource/sh_mtu2.c | 7 +- + drivers/clocksource/timer-imx-gpt.c | 19 ---- + drivers/clocksource/timer-mediatek-cpux.c | 140 +++++++++++++++++++++++++++++ + drivers/clocksource/timer-mediatek.c | 114 ----------------------- + drivers/clocksource/timer-stm32-lp.c | 11 +-- + drivers/clocksource/timer-tegra186.c | 6 +- + drivers/clocksource/timer-ti-dm-systimer.c | 57 ++++++------ + drivers/clocksource/timer-ti-dm.c | 7 +- + include/soc/imx/timer.h | 7 -- + 12 files changed, 188 insertions(+), 192 deletions(-) + create mode 100644 drivers/clocksource/timer-mediatek-cpux.c +Merging edac/edac-for-next (d6c5e688899b0 Merge branch 'edac-drivers' into edac-for-next) + e088d80e2a1e7 ("EDAC/altera: Remove MODULE_LICENSE in non-module") +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/altera_edac.c +Merge made by the 'recursive' strategy. + drivers/edac/altera_edac.c | 9 +- + drivers/edac/amd64_edac.c | 1020 ++++++++++++++++++---------------------- + drivers/edac/amd64_edac.h | 67 +-- + drivers/edac/amd8111_edac.c | 2 +- + drivers/edac/amd8131_edac.c | 2 +- + drivers/edac/e752x_edac.c | 2 +- + drivers/edac/e7xxx_edac.c | 3 +- + drivers/edac/i10nm_base.c | 1 + + drivers/edac/i5000_edac.c | 7 +- + drivers/edac/i5100_edac.c | 5 +- + drivers/edac/i82860_edac.c | 3 +- + drivers/edac/layerscape_edac.c | 3 +- + drivers/edac/mpc85xx_edac.c | 3 +- + drivers/edac/r82600_edac.c | 3 +- + drivers/edac/skx_base.c | 4 +- + 15 files changed, 490 insertions(+), 644 deletions(-) +Merging irqchip/irq/irqchip-next (9860dac91964b Merge branch irq/loongarch-fixes-6.4 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/irq-loongson-eiointc.c +Auto-merging arch/riscv/mm/cacheflush.c +Auto-merging arch/riscv/kernel/smp.c +Auto-merging arch/riscv/kernel/cpu-hotplug.c +Auto-merging arch/riscv/kernel/Makefile +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + Documentation/arm64/silicon-errata.rst | 2 + + arch/riscv/Kconfig | 2 + + arch/riscv/include/asm/irq.h | 4 + + arch/riscv/include/asm/sbi.h | 9 +- + arch/riscv/include/asm/smp.h | 49 +++++++--- + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/cpu-hotplug.c | 3 +- + arch/riscv/kernel/irq.c | 21 +++- + arch/riscv/kernel/sbi-ipi.c | 77 +++++++++++++++ + arch/riscv/kernel/sbi.c | 100 +++---------------- + arch/riscv/kernel/smp.c | 171 +++++++++++++++++---------------- + arch/riscv/kernel/smpboot.c | 5 +- + arch/riscv/mm/cacheflush.c | 5 +- + arch/riscv/mm/tlbflush.c | 93 +++++++++++++++--- + drivers/clocksource/timer-clint.c | 65 ++++++++++--- + drivers/firmware/smccc/smccc.c | 26 +++++ + drivers/firmware/smccc/soc_id.c | 28 +----- + drivers/irqchip/Kconfig | 3 + + drivers/irqchip/irq-bcm6345-l1.c | 6 +- + drivers/irqchip/irq-csky-apb-intc.c | 2 +- + drivers/irqchip/irq-gic-v2m.c | 2 +- + drivers/irqchip/irq-gic-v3.c | 115 +++++++++++++++++++--- + drivers/irqchip/irq-gic.c | 60 +----------- + drivers/irqchip/irq-loongson-eiointc.c | 32 ++++-- + drivers/irqchip/irq-loongson-pch-pic.c | 6 +- + drivers/irqchip/irq-riscv-intc.c | 71 ++++++++------ + drivers/irqchip/irq-sifive-plic.c | 93 +++++++++++++++++- + include/linux/arm-smccc.h | 18 ++++ + include/linux/irqchip/arm-gic.h | 6 -- + 29 files changed, 713 insertions(+), 362 deletions(-) + create mode 100644 arch/riscv/kernel/sbi-ipi.c +Merging ftrace/for-next (88fe1ec75fcb2 tracing: Unbreak user events) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging lib/test_fprobe.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging kernel/exit.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/ftrace.h +Auto-merging fs/exec.c +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a741ae85b08aa] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + Documentation/trace/fprobe.rst | 16 +- + Documentation/trace/ftrace.rst | 6 + + Documentation/trace/user_events.rst | 167 ++-- + fs/exec.c | 2 + + include/linux/fprobe.h | 10 +- + include/linux/ftrace.h | 5 +- + include/linux/sched.h | 5 + + include/linux/user_events.h | 101 ++- + include/uapi/linux/user_events.h | 81 ++ + kernel/exit.c | 2 + + kernel/fork.c | 2 + + kernel/trace/Kconfig | 6 +- + kernel/trace/bpf_trace.c | 17 +- + kernel/trace/fprobe.c | 32 +- + kernel/trace/ftrace.c | 51 +- + kernel/trace/ring_buffer.c | 77 +- + kernel/trace/trace.c | 7 +- + kernel/trace/trace.h | 2 + + kernel/trace/trace_events_user.c | 932 +++++++++++++++++----- + kernel/trace/trace_output.c | 168 ++++ + kernel/trace/trace_output.h | 2 + + lib/test_fprobe.c | 105 ++- + samples/fprobe/fprobe_example.c | 7 +- + samples/user_events/example.c | 45 +- + scripts/leaking_addresses.pl | 1 + + tools/kvm/kvm_stat/kvm_stat | 2 +- + tools/testing/selftests/mm/protection_keys.c | 4 +- + tools/testing/selftests/user_events/Makefile | 2 +- + tools/testing/selftests/user_events/abi_test.c | 226 ++++++ + tools/testing/selftests/user_events/dyn_test.c | 2 +- + tools/testing/selftests/user_events/ftrace_test.c | 162 ++-- + tools/testing/selftests/user_events/perf_test.c | 39 +- + 32 files changed, 1776 insertions(+), 510 deletions(-) + create mode 100644 include/uapi/linux/user_events.h + create mode 100644 tools/testing/selftests/user_events/abi_test.c +Merging rcu/rcu/next (523c1335f23e4 Merge branches 'urgent-rcu.2023.04.05a' and 'joel-boqun.2023.04.05a' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging scripts/checkpatch.pl +Auto-merging net/mac802154/scan.c +Auto-merging mm/Kconfig +Auto-merging lib/test_vmalloc.c +Auto-merging kernel/trace/trace_osnoise.c +Auto-merging fs/ext4/super.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c +Auto-merging drivers/block/drbd/drbd_state.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/drbd/drbd_nl.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../Expedited-Grace-Periods.rst | 6 +- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 2 +- + Documentation/RCU/RTFP.txt | 10 +- + Documentation/RCU/UP.rst | 4 +- + Documentation/RCU/checklist.rst | 2 +- + Documentation/RCU/lockdep.rst | 2 +- + Documentation/RCU/torture.rst | 4 +- + Documentation/RCU/whatisRCU.rst | 6 +- + Documentation/litmus-tests/README | 2 +- + .../litmus-tests/locking/DCL-broken.litmus | 54 +++ + .../litmus-tests/locking/DCL-fixed.litmus | 55 +++ + .../litmus-tests/locking/RM-broken.litmus | 41 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 41 ++ + MAINTAINERS | 4 +- + arch/arm64/kvm/Kconfig | 1 - + arch/mips/kvm/Kconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 - + arch/riscv/kvm/Kconfig | 1 - + arch/s390/kvm/Kconfig | 1 - + arch/x86/Kconfig | 2 - + arch/x86/kvm/Kconfig | 1 - + drivers/base/cpu.c | 3 +- + drivers/block/drbd/drbd_nl.c | 6 +- + drivers/block/drbd/drbd_receiver.c | 4 +- + drivers/block/drbd/drbd_state.c | 2 +- + drivers/misc/vmw_vmci/vmci_context.c | 2 +- + drivers/misc/vmw_vmci/vmci_event.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/tc/int_port.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 4 +- + fs/ext4/super.c | 2 +- + include/linux/instrumented.h | 63 ++- + include/linux/lockdep.h | 8 +- + include/linux/notifier.h | 5 +- + include/linux/srcu.h | 34 +- + include/linux/srcutiny.h | 6 +- + include/linux/srcutree.h | 94 +++-- + include/linux/tick.h | 2 + + include/trace/events/rcu.h | 4 +- + include/trace/events/timer.h | 3 +- + kernel/kcsan/core.c | 17 +- + kernel/locking/lockdep.c | 64 ++- + kernel/locking/locktorture.c | 188 ++++++++- + kernel/locking/test-ww_mutex.c | 2 +- + kernel/rcu/Kconfig | 3 - + kernel/rcu/rcu.h | 43 +- + kernel/rcu/rcuscale.c | 9 +- + kernel/rcu/rcutorture.c | 234 ++++++++++- + kernel/rcu/refscale.c | 2 +- + kernel/rcu/srcutiny.c | 2 + + kernel/rcu/srcutree.c | 438 ++++++++++++--------- + kernel/rcu/tasks.h | 33 ++ + kernel/rcu/tree.c | 18 +- + kernel/rcu/tree_exp.h | 16 +- + kernel/rcu/tree_nocb.h | 4 + + kernel/time/tick-sched.c | 16 +- + kernel/trace/trace_osnoise.c | 2 +- + kernel/trace/trace_probe.c | 2 +- + lib/test_vmalloc.c | 2 +- + mm/Kconfig | 1 - + net/core/sysctl_net_core.c | 4 +- + net/mac802154/scan.c | 4 +- + scripts/checkpatch.pl | 9 + + tools/include/nolibc/.gitignore | 1 + + tools/include/nolibc/Makefile | 4 +- + tools/include/nolibc/arch-i386.h | 7 +- + tools/include/nolibc/arch-loongarch.h | 200 ++++++++++ + tools/include/nolibc/arch-x86_64.h | 5 + + tools/include/nolibc/arch.h | 2 + + tools/include/nolibc/nolibc.h | 1 + + tools/include/nolibc/stackprotector.h | 53 +++ + tools/include/nolibc/std.h | 15 +- + tools/include/nolibc/stdint.h | 99 +++++ + tools/include/nolibc/sys.h | 100 ++++- + tools/include/nolibc/types.h | 30 +- + tools/include/nolibc/unistd.h | 5 + + tools/memory-model/Documentation/explanation.txt | 178 ++++++++- + tools/memory-model/Documentation/litmus-tests.txt | 27 +- + tools/memory-model/Documentation/locking.txt | 298 ++++++++++++++ + tools/memory-model/linux-kernel.bell | 30 +- + tools/memory-model/linux-kernel.cat | 20 +- + tools/memory-model/linux-kernel.def | 7 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/lock.cat | 6 +- + tools/memory-model/scripts/README | 48 ++- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 15 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 ++- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 ++++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/rcu/extract-stall.sh | 26 +- + tools/testing/selftests/nolibc/Makefile | 90 +++-- + tools/testing/selftests/nolibc/nolibc-test.c | 221 ++++++++--- + .../testing/selftests/rcutorture/bin/kvm-again.sh | 2 +- + .../selftests/rcutorture/bin/srcu_lockdep.sh | 78 ++++ + tools/testing/selftests/rcutorture/bin/torture.sh | 6 +- + .../selftests/rcutorture/configs/lock/CFLIST | 2 + + .../selftests/rcutorture/configs/lock/LOCK08 | 6 + + .../selftests/rcutorture/configs/lock/LOCK08.boot | 1 + + .../selftests/rcutorture/configs/lock/LOCK09 | 6 + + .../selftests/rcutorture/configs/lock/LOCK09.boot | 1 + + .../selftests/rcutorture/configs/rcu/TREE01 | 1 + + .../selftests/rcutorture/configs/rcu/TREE04 | 1 + + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + 112 files changed, 2988 insertions(+), 669 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/include/nolibc/.gitignore + create mode 100644 tools/include/nolibc/arch-loongarch.h + create mode 100644 tools/include/nolibc/stackprotector.h + create mode 100644 tools/include/nolibc/stdint.h + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + mode change 100644 => 100755 tools/rcu/extract-stall.sh + create mode 100755 tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK08 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK08.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK09 + create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK09.boot +$ git am -3 ../patches/0001-fixup-for-RDMA-rxe-Add-error-messages.patch +Applying: fixup for "RDMA/rxe: Add error messages" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/infiniband/sw/rxe/rxe_verbs.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 34d2866ae3548] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git + Date: Fri Apr 14 14:47:20 2023 +0100 +Merging kvm/next (400d2132288ed KVM: SVM: Return the local "r" variable from svm_set_msr()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/linux/kvm_host.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/powerpc/kvm/book3s_pr.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c +Auto-merging arch/powerpc/include/asm/kvm_ppc.h +Auto-merging arch/arm64/kvm/arm.c +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 3 +- + arch/arm64/include/asm/kvm_host.h | 4 +- + arch/arm64/kvm/arm.c | 3 +- + arch/arm64/kvm/guest.c | 8 ++- + arch/mips/kvm/mips.c | 4 +- + arch/powerpc/include/asm/kvm_ppc.h | 14 ++--- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 14 ++--- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 6 +- + arch/powerpc/kvm/book3s_pr.c | 4 +- + arch/powerpc/kvm/powerpc.c | 5 +- + arch/riscv/kvm/vm.c | 3 +- + arch/s390/kvm/kvm-s390.c | 7 +-- + arch/x86/include/asm/kvm_host.h | 37 ++++++------ + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 5 +- + arch/x86/kvm/mmu/mmu_internal.h | 12 +++- + arch/x86/kvm/mmu/paging_tmpl.h | 61 ++++--------------- + arch/x86/kvm/svm/svm.c | 34 +++++------ + arch/x86/kvm/vmx/hyperv.c | 107 ++++++++++++++++++++++++++++++++- + arch/x86/kvm/vmx/hyperv.h | 115 +++--------------------------------- + arch/x86/kvm/vmx/nested.c | 3 + + arch/x86/kvm/vmx/vmx.c | 52 +++++----------- + arch/x86/kvm/vmx/vmx.h | 2 +- + arch/x86/kvm/vmx/vmx_ops.h | 22 +++---- + arch/x86/kvm/x86.c | 49 +++++++-------- + include/linux/kvm_host.h | 3 +- + include/uapi/linux/kvm.h | 2 +- + tools/include/uapi/linux/kvm.h | 2 +- + virt/kvm/kvm_main.c | 4 +- + 30 files changed, 275 insertions(+), 316 deletions(-) +Merging kvm-arm/next (eb6d203935d1b Merge branch kvm-arm64/spec-ptw into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging include/uapi/linux/kvm.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/arm64/tools/sysreg +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/kvm/pmu-emul.c +Auto-merging arch/arm64/kvm/guest.c +Auto-merging arch/arm64/kvm/arm.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/arm.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/kvm_host.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h +Auto-merging Documentation/virt/kvm/api.rst +Resolved 'arch/arm64/include/asm/kvm_host.h' using previous resolution. +Resolved 'arch/arm64/kvm/arm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c0456922b4222] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 71 ++- + Documentation/virt/kvm/devices/vm.rst | 79 +++ + arch/arm64/include/asm/kvm_host.h | 25 +- + arch/arm64/include/asm/kvm_mmu.h | 4 + + arch/arm64/include/asm/sysreg.h | 3 + + arch/arm64/include/uapi/asm/kvm.h | 36 ++ + arch/arm64/kernel/cpufeature.c | 11 + + arch/arm64/kvm/arch_timer.c | 550 ++++++++++++++++----- + arch/arm64/kvm/arm.c | 141 +++++- + arch/arm64/kvm/guest.c | 31 +- + arch/arm64/kvm/handle_exit.c | 36 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 53 ++ + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 2 - + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 7 + + arch/arm64/kvm/hyp/nvhe/switch.c | 18 + + arch/arm64/kvm/hyp/nvhe/timer-sr.c | 18 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 38 +- + arch/arm64/kvm/hyp/vhe/switch.c | 7 +- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 12 + + arch/arm64/kvm/hypercalls.c | 189 ++++++- + arch/arm64/kvm/pmu-emul.c | 25 +- + arch/arm64/kvm/psci.c | 35 +- + arch/arm64/kvm/reset.c | 15 +- + arch/arm64/kvm/sys_regs.c | 10 + + arch/arm64/kvm/trace_arm.h | 6 +- + arch/arm64/kvm/vgic/vgic-debug.c | 8 +- + arch/arm64/kvm/vgic/vgic-init.c | 36 +- + arch/arm64/kvm/vgic/vgic-its.c | 33 +- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 85 ++-- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 4 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 12 +- + arch/arm64/kvm/vgic/vgic-v4.c | 11 +- + arch/arm64/kvm/vgic/vgic.c | 27 +- + arch/arm64/kvm/vgic/vgic.h | 3 - + arch/arm64/tools/cpucaps | 1 + + arch/arm64/tools/sysreg | 4 + + arch/x86/include/asm/kvm_host.h | 7 + + arch/x86/include/uapi/asm/kvm.h | 3 + + arch/x86/kvm/x86.c | 6 +- + include/clocksource/arm_arch_timer.h | 1 + + include/kvm/arm_arch_timer.h | 34 +- + include/kvm/arm_hypercalls.h | 6 +- + include/kvm/arm_vgic.h | 1 + + include/uapi/linux/kvm.h | 12 +- + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/aarch64/arch_timer.c | 56 ++- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 15 +- + tools/testing/selftests/kvm/aarch64/smccc_filter.c | 268 ++++++++++ + tools/testing/selftests/kvm/config | 1 + + .../selftests/kvm/include/aarch64/processor.h | 13 + + .../testing/selftests/kvm/lib/aarch64/processor.c | 91 ++-- + 51 files changed, 1753 insertions(+), 408 deletions(-) + create mode 100644 tools/testing/selftests/kvm/aarch64/smccc_filter.c +Merging kvms390/next (5fc5b94a27365 s390/virtio: sort out physical vs virtual pointers usage) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-x86/next (a25497a280bbd Merge branch 'pmu') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging virt/kvm/kvm_main.c +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging include/linux/kvm_host.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/svm/svm_onhyperv.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/kvm_onhyperv.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/api.rst | 1 + + Documentation/virt/kvm/locking.rst | 2 +- + arch/mips/include/asm/kvm_host.h | 2 +- + arch/mips/kvm/vz.c | 2 +- + arch/x86/include/asm/cpufeatures.h | 9 +- + arch/x86/include/asm/kvm-x86-ops.h | 6 +- + arch/x86/include/asm/kvm_host.h | 45 +- + arch/x86/include/asm/svm.h | 10 +- + arch/x86/kvm/cpuid.c | 16 +- + arch/x86/kvm/emulate.c | 8 + + arch/x86/kvm/kvm_cache_regs.h | 18 +- + arch/x86/kvm/kvm_onhyperv.c | 33 +- + arch/x86/kvm/kvm_onhyperv.h | 5 +- + arch/x86/kvm/mmu.h | 28 +- + arch/x86/kvm/mmu/mmu.c | 519 ++++++++++++--------- + arch/x86/kvm/mmu/mmu_internal.h | 8 +- + arch/x86/kvm/mmu/paging_tmpl.h | 214 +++------ + arch/x86/kvm/mmu/spte.c | 2 +- + arch/x86/kvm/mmu/tdp_iter.h | 48 +- + arch/x86/kvm/mmu/tdp_mmu.c | 215 +++------ + arch/x86/kvm/pmu.c | 25 +- + arch/x86/kvm/pmu.h | 2 +- + arch/x86/kvm/svm/nested.c | 91 +++- + arch/x86/kvm/svm/pmu.c | 2 +- + arch/x86/kvm/svm/svm.c | 161 +++++-- + arch/x86/kvm/svm/svm.h | 29 ++ + arch/x86/kvm/svm/svm_onhyperv.h | 5 +- + arch/x86/kvm/vmx/nested.c | 123 +++-- + arch/x86/kvm/vmx/pmu_intel.c | 135 +++--- + arch/x86/kvm/vmx/sgx.c | 4 +- + arch/x86/kvm/vmx/vmx.c | 44 +- + arch/x86/kvm/vmx/vmx.h | 18 + + arch/x86/kvm/x86.c | 201 +++++--- + arch/x86/kvm/x86.h | 64 ++- + include/linux/kvm_host.h | 4 +- + include/linux/kvm_types.h | 2 +- + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/demand_paging_test.c | 2 +- + .../testing/selftests/kvm/include/kvm_util_base.h | 1 + + .../selftests/kvm/include/x86_64/processor.h | 124 ++++- + tools/testing/selftests/kvm/lib/kvm_util.c | 5 + + tools/testing/selftests/kvm/lib/x86_64/processor.c | 36 +- + tools/testing/selftests/kvm/x86_64/amx_test.c | 118 ++--- + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 1 + + .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 8 +- + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 231 +++++++-- + .../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 132 ++++++ + virt/kvm/kvm_main.c | 26 +- + 48 files changed, 1798 insertions(+), 988 deletions(-) + create mode 100644 tools/testing/selftests/kvm/x86_64/xcr0_cpuid_test.c +$ git am -3 ../patches/0001-fixup-for-KVM-x86-Rename-Hyper-V-remote-TLB-hooks-to.patch +Applying: fixup for "KVM: x86: Rename Hyper-V remote TLB hooks to match established scheme" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kvm/kvm_onhyperv.h +M arch/x86/kvm/svm/svm.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 403d6687490ab] Merge branch 'next' of https://github.com/kvm-x86/linux.git + Date: Fri Apr 14 14:56:54 2023 +0100 +Merging xen-tip/linux-next (fb47c4966007b xen/pvcalls: don't call bind_evtchn_to_irqhandler() under lock) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'recursive' strategy. + drivers/xen/pvcalls-front.c | 46 +++++++++++++++++++++----------------- + drivers/xen/xen-pciback/pci_stub.c | 6 ++--- + drivers/xen/xen-scsiback.c | 27 +++++++++++----------- + 3 files changed, 42 insertions(+), 37 deletions(-) +Merging percpu/for-next (b9819165bb455 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging workqueues/for-next (704bc669e1dda workqueue: Introduce show_freezable_workqueues) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Auto-merging include/linux/workqueue.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + include/linux/workqueue.h | 1 + + kernel/power/process.c | 2 +- + kernel/workqueue.c | 134 +++++++++++++++++++++++++++++++++++++++++----- + 4 files changed, 124 insertions(+), 14 deletions(-) +Merging drivers-x86/for-next (5b309e80f457e platform/x86: amd: pmc: Remove __maybe_unused from amd_pmc_suspend_handler()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Removing include/linux/apple_bl.h +Removing drivers/platform/x86/x86-android-tablets.c +Auto-merging drivers/platform/x86/think-lmi.c +Auto-merging drivers/platform/x86/serial-multi-instantiate.c +Removing drivers/platform/x86/peaq-wmi.c +Auto-merging drivers/platform/x86/intel/vsec.c +Auto-merging drivers/platform/x86/intel/pmc/core.c +Auto-merging drivers/platform/x86/ideapad-laptop.c +Auto-merging drivers/platform/x86/acerhdf.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform-intel-ifs | 17 +- + MAINTAINERS | 15 +- + arch/x86/include/asm/msr-index.h | 2 + + drivers/platform/mellanox/mlxbf-bootctl.c | 19 + + drivers/platform/mellanox/mlxbf-bootctl.h | 6 + + drivers/platform/olpc/olpc-xo175-ec.c | 1 + + .../platform/surface/surface_aggregator_registry.c | 2 +- + .../platform/surface/surface_aggregator_tabletsw.c | 180 +- + drivers/platform/x86/Kconfig | 42 +- + drivers/platform/x86/Makefile | 5 +- + drivers/platform/x86/acer-wmi.c | 5 +- + drivers/platform/x86/acerhdf.c | 2 +- + drivers/platform/x86/adv_swbutton.c | 6 +- + drivers/platform/x86/amd/Kconfig | 2 +- + drivers/platform/x86/amd/hsmp.c | 6 +- + drivers/platform/x86/amd/pmc.c | 164 +- + drivers/platform/x86/amd/pmf/Kconfig | 1 + + drivers/platform/x86/amd/pmf/core.c | 27 +- + drivers/platform/x86/amilo-rfkill.c | 5 +- + drivers/platform/x86/apple-gmux.c | 404 ++++- + drivers/platform/x86/barco-p50-gpio.c | 6 +- + drivers/platform/x86/classmate-laptop.c | 2 +- + drivers/platform/x86/compal-laptop.c | 8 +- + drivers/platform/x86/dell/dcdbas.c | 6 +- + drivers/platform/x86/dell/dell-laptop.c | 42 + + drivers/platform/x86/dell/dell-smbios.h | 2 + + drivers/platform/x86/dell/dell-smo8800.c | 5 +- + drivers/platform/x86/hp/hp_accel.c | 5 +- + drivers/platform/x86/hp/tc1100-wmi.c | 6 +- + drivers/platform/x86/huawei-wmi.c | 6 +- + drivers/platform/x86/ideapad-laptop.c | 141 +- + drivers/platform/x86/ideapad-laptop.h | 152 ++ + drivers/platform/x86/intel/Kconfig | 10 + + drivers/platform/x86/intel/Makefile | 2 + + drivers/platform/x86/intel/bxtwc_tmu.c | 5 +- + drivers/platform/x86/intel/bytcrc_pwrsrc.c | 181 ++ + drivers/platform/x86/intel/chtdc_ti_pwrbtn.c | 5 +- + drivers/platform/x86/intel/chtwc_int33fe.c | 6 +- + drivers/platform/x86/intel/hid.c | 10 +- + drivers/platform/x86/intel/ifs/core.c | 81 +- + drivers/platform/x86/intel/ifs/ifs.h | 68 +- + drivers/platform/x86/intel/ifs/load.c | 9 +- + drivers/platform/x86/intel/ifs/runtest.c | 94 +- + drivers/platform/x86/intel/ifs/sysfs.c | 21 +- + drivers/platform/x86/intel/int0002_vgpio.c | 5 +- + drivers/platform/x86/intel/int1092/intel_sar.c | 5 +- + drivers/platform/x86/intel/int3472/discrete.c | 6 +- + drivers/platform/x86/intel/mrfld_pwrbtn.c | 5 +- + drivers/platform/x86/intel/pmc/core.c | 5 +- + drivers/platform/x86/intel/pmc/mtl.c | 31 + + drivers/platform/x86/intel/pmt/class.c | 6 +- + drivers/platform/x86/intel/pmt/crashlog.c | 1 + + drivers/platform/x86/intel/pmt/telemetry.c | 1 + + drivers/platform/x86/intel/speed_select_if/Kconfig | 4 + + .../platform/x86/intel/speed_select_if/Makefile | 2 + + .../x86/intel/speed_select_if/isst_if_common.c | 47 +- + .../x86/intel/speed_select_if/isst_if_common.h | 8 +- + .../platform/x86/intel/speed_select_if/isst_tpmi.c | 72 + + .../x86/intel/speed_select_if/isst_tpmi_core.c | 1440 ++++++++++++++++ + .../x86/intel/speed_select_if/isst_tpmi_core.h | 18 + + drivers/platform/x86/intel/telemetry/pltdrv.c | 5 +- + .../x86/intel/uncore-frequency/uncore-frequency.c | 7 + + drivers/platform/x86/intel/vbtn.c | 10 +- + drivers/platform/x86/intel/vsec.c | 75 +- + drivers/platform/x86/intel/vsec.h | 9 +- + drivers/platform/x86/lenovo-ymc.c | 187 ++ + drivers/platform/x86/msi-ec.c | 897 ++++++++++ + drivers/platform/x86/msi-ec.h | 122 ++ + drivers/platform/x86/pcengines-apuv2.c | 1 - + drivers/platform/x86/peaq-wmi.c | 128 -- + drivers/platform/x86/samsung-q10.c | 6 +- + drivers/platform/x86/serial-multi-instantiate.c | 6 +- + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/platform/x86/think-lmi.c | 49 +- + drivers/platform/x86/wmi.c | 6 +- + drivers/platform/x86/x86-android-tablets.c | 1803 -------------------- + drivers/platform/x86/x86-android-tablets/Kconfig | 21 + + drivers/platform/x86/x86-android-tablets/Makefile | 9 + + drivers/platform/x86/x86-android-tablets/asus.c | 325 ++++ + drivers/platform/x86/x86-android-tablets/core.c | 391 +++++ + drivers/platform/x86/x86-android-tablets/dmi.c | 165 ++ + drivers/platform/x86/x86-android-tablets/lenovo.c | 602 +++++++ + drivers/platform/x86/x86-android-tablets/other.c | 522 ++++++ + .../x86/x86-android-tablets/shared-psy-info.c | 100 ++ + .../x86/x86-android-tablets/shared-psy-info.h | 32 + + .../x86/x86-android-tablets/x86-android-tablets.h | 108 ++ + drivers/platform/x86/xo1-rfkill.c | 5 +- + drivers/video/backlight/Kconfig | 1 + + drivers/video/backlight/apple_bl.c | 31 +- + include/linux/apple-gmux.h | 72 +- + include/linux/apple_bl.h | 27 - + include/uapi/linux/isst_if.h | 303 ++++ + tools/power/x86/intel-speed-select/Build | 2 +- + tools/power/x86/intel-speed-select/isst-config.c | 769 +++++---- + .../power/x86/intel-speed-select/isst-core-mbox.c | 1066 ++++++++++++ + .../power/x86/intel-speed-select/isst-core-tpmi.c | 787 +++++++++ + tools/power/x86/intel-speed-select/isst-core.c | 846 ++------- + tools/power/x86/intel-speed-select/isst-daemon.c | 38 +- + tools/power/x86/intel-speed-select/isst-display.c | 245 ++- + tools/power/x86/intel-speed-select/isst.h | 96 +- + 100 files changed, 9435 insertions(+), 3881 deletions(-) + create mode 100644 drivers/platform/x86/ideapad-laptop.h + create mode 100644 drivers/platform/x86/intel/bytcrc_pwrsrc.c + create mode 100644 drivers/platform/x86/intel/speed_select_if/isst_tpmi.c + create mode 100644 drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c + create mode 100644 drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.h + create mode 100644 drivers/platform/x86/lenovo-ymc.c + create mode 100644 drivers/platform/x86/msi-ec.c + create mode 100644 drivers/platform/x86/msi-ec.h + delete mode 100644 drivers/platform/x86/peaq-wmi.c + delete mode 100644 drivers/platform/x86/x86-android-tablets.c + create mode 100644 drivers/platform/x86/x86-android-tablets/Kconfig + create mode 100644 drivers/platform/x86/x86-android-tablets/Makefile + create mode 100644 drivers/platform/x86/x86-android-tablets/asus.c + create mode 100644 drivers/platform/x86/x86-android-tablets/core.c + create mode 100644 drivers/platform/x86/x86-android-tablets/dmi.c + create mode 100644 drivers/platform/x86/x86-android-tablets/lenovo.c + create mode 100644 drivers/platform/x86/x86-android-tablets/other.c + create mode 100644 drivers/platform/x86/x86-android-tablets/shared-psy-info.c + create mode 100644 drivers/platform/x86/x86-android-tablets/shared-psy-info.h + create mode 100644 drivers/platform/x86/x86-android-tablets/x86-android-tablets.h + delete mode 100644 include/linux/apple_bl.h + create mode 100644 tools/power/x86/intel-speed-select/isst-core-mbox.c + create mode 100644 tools/power/x86/intel-speed-select/isst-core-tpmi.c +Merging chrome-platform/for-next (419346a038103 platform/chrome: cros_ec_debugfs: fix kernel-doc warning) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1519 and retry the command. +Merge made by the 'recursive' strategy. + drivers/platform/chrome/cros_ec.c | 10 +++--- + drivers/platform/chrome/cros_ec_debugfs.c | 42 ++++++++++++++++++++------ + drivers/platform/chrome/cros_typec_switch.c | 1 + + include/linux/platform_data/cros_ec_commands.h | 2 +- + 4 files changed, 39 insertions(+), 16 deletions(-) +Merging hsi/for-next (1b929c02afd37 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (1b929c02afd37 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging leds-lj/for-leds-next (c1087c29e96a4 leds: tca6507: Fix error handling of using fwnode_property_read_string) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 35 +- + .../bindings/leds/qcom,spmi-flash-led.yaml | 117 +++ + Documentation/leds/index.rst | 1 + + Documentation/leds/leds-mt6370-rgb.rst | 64 ++ + MAINTAINERS | 1 + + drivers/leds/Kconfig | 2 +- + drivers/leds/flash/Kconfig | 28 + + drivers/leds/flash/Makefile | 2 + + drivers/leds/flash/leds-mt6370-flash.c | 573 +++++++++++ + drivers/leds/flash/leds-qcom-flash.c | 773 +++++++++++++++ + drivers/leds/leds-lp8860.c | 10 +- + drivers/leds/leds-tca6507.c | 5 +- + drivers/leds/leds-tlc591xx.c | 2 +- + drivers/leds/rgb/Kconfig | 13 + + drivers/leds/rgb/Makefile | 1 + + drivers/leds/rgb/leds-mt6370-rgb.c | 1011 ++++++++++++++++++++ + drivers/leds/trigger/Kconfig | 1 + + include/linux/leds.h | 2 +- + 18 files changed, 2626 insertions(+), 15 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/qcom,spmi-flash-led.yaml + create mode 100644 Documentation/leds/leds-mt6370-rgb.rst + create mode 100644 drivers/leds/flash/leds-mt6370-flash.c + create mode 100644 drivers/leds/flash/leds-qcom-flash.c + create mode 100644 drivers/leds/rgb/leds-mt6370-rgb.c +Merging ipmi/for-next (d08076678ce72 ipmi:ssif: Drop if blocks with always false condition) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/Kconfig | 3 ++- + drivers/char/ipmi/ipmi_poweroff.c | 16 +--------------- + drivers/char/ipmi/ipmi_ssif.c | 16 ++++++---------- + 3 files changed, 9 insertions(+), 26 deletions(-) +Merging driver-core/driver-core-next (862d8312eed99 tty: make tty_class a static const structure) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging tools/testing/nvdimm/test/nfit.c +Auto-merging mm/backing-dev.c +Auto-merging kernel/workqueue.c +Auto-merging kernel/cpu.c +Auto-merging init/Kconfig +Auto-merging include/linux/iommu.h +Auto-merging fs/pstore/pmsg.c +Auto-merging fs/ksmbd/server.c +Auto-merging fs/kernfs/file.c +Auto-merging fs/kernfs/dir.c +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/usb/core/usb.h +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/spi/spidev.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/soc/qcom/rmtfs_mem.c +Auto-merging drivers/scsi/ses.c +Auto-merging drivers/sbus/char/oradax.c +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/s390/crypto/ap_bus.c +Auto-merging drivers/ptp/ptp_ocp.c +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging drivers/platform/x86/intel/pmt/class.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/net/wwan/wwan_hwsim.c +Auto-merging drivers/net/wwan/wwan_core.c +Auto-merging drivers/net/wireless/virtual/mac80211_hwsim.c +Auto-merging drivers/mtd/ubi/build.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/irqchip/irq-mbigen.c +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c +Auto-merging drivers/infiniband/core/user_mad.c +Auto-merging drivers/hwmon/hwmon.c +Auto-merging drivers/hwmon/drivetemp.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.h +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/fpga/fpga-bridge.c +Auto-merging drivers/cxl/core/port.c +Auto-merging drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c +Auto-merging drivers/crypto/hisilicon/qm.c +Auto-merging drivers/cpufreq/intel_pstate.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/cpufreq/amd-pstate.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/block/ublk_drv.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/ata/pata_parport/pata_parport.c +Auto-merging drivers/accel/habanalabs/common/habanalabs_drv.c +Auto-merging block/genhd.c +Auto-merging arch/x86/kernel/cpu/microcode/core.c +Auto-merging arch/s390/kernel/topology.c +CONFLICT (content): Merge conflict in arch/s390/kernel/topology.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/powerpc/platforms/pseries/vio.c +Auto-merging arch/powerpc/platforms/pseries/mobility.c +Auto-merging arch/powerpc/platforms/powernv/subcore.c +Auto-merging arch/mips/sibyte/common/sb_tbprof.c +CONFLICT (modify/delete): arch/mips/kernel/vpe-cmp.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of arch/mips/kernel/vpe-cmp.c left in tree. +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/s390/kernel/topology.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b37d17a5a5df6] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-devices-state_synced | 5 + + Documentation/admin-guide/kernel-parameters.txt | 23 +- + Documentation/driver-api/driver-model/bus.rst | 4 +- + Documentation/driver-api/firmware/fw_upload.rst | 3 +- + Documentation/filesystems/sysfs.rst | 4 +- + .../translations/zh_CN/filesystems/sysfs.txt | 4 +- + .../translations/zh_TW/filesystems/sysfs.txt | 4 +- + MAINTAINERS | 2 + + arch/arm/include/asm/dma-iommu.h | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm64/kernel/cpufeature.c | 10 +- + arch/mips/kernel/mips-mt.c | 2 +- + arch/mips/kernel/vpe-mt.c | 1 - + arch/mips/sibyte/common/sb_tbprof.c | 2 +- + arch/powerpc/kernel/sysfs.c | 14 +- + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/powerpc/platforms/powernv/idle.c | 9 +- + arch/powerpc/platforms/powernv/subcore.c | 10 +- + arch/powerpc/platforms/pseries/dlpar.c | 4 +- + arch/powerpc/platforms/pseries/ibmebus.c | 4 +- + arch/powerpc/platforms/pseries/mobility.c | 4 +- + arch/powerpc/platforms/pseries/pseries_energy.c | 28 +- + arch/powerpc/platforms/pseries/suspend.c | 10 +- + arch/powerpc/platforms/pseries/vio.c | 8 +- + arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c | 21 +- + arch/s390/kernel/smp.c | 12 +- + arch/s390/kernel/topology.c | 11 +- + arch/sh/drivers/dma/dma-sysfs.c | 8 +- + arch/x86/kernel/cpu/microcode/core.c | 13 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- + arch/x86/kernel/cpu/umwait.c | 8 +- + arch/x86/kernel/cpuid.c | 2 +- + arch/x86/kernel/msr.c | 2 +- + block/bsg.c | 2 +- + block/genhd.c | 20 +- + drivers/accel/drm_accel.c | 2 +- + drivers/accel/habanalabs/common/habanalabs_drv.c | 2 +- + drivers/acpi/acpi_lpit.c | 16 +- + drivers/ata/pata_parport/pata_parport.c | 6 +- + drivers/base/Kconfig | 12 + + drivers/base/base.h | 114 ++++---- + drivers/base/bus.c | 48 ++-- + drivers/base/class.c | 247 ++++++++++------- + drivers/base/core.c | 297 ++++++++++++--------- + drivers/base/dd.c | 29 +- + drivers/base/devcoredump.c | 5 +- + drivers/base/devres.c | 11 +- + drivers/base/devtmpfs.c | 9 - + drivers/base/firmware_loader/Kconfig | 12 + + drivers/base/firmware_loader/main.c | 48 +++- + drivers/base/firmware_loader/sysfs.c | 4 +- + drivers/base/physical_location.h | 2 +- + drivers/base/power/wakeup_stats.c | 2 +- + drivers/base/property.c | 132 ++++++--- + drivers/base/soc.c | 15 ++ + drivers/block/aoe/aoechr.c | 2 +- + drivers/block/pktcdvd.c | 47 ++-- + drivers/block/rbd.c | 34 ++- + drivers/block/rnbd/rnbd-clt-sysfs.c | 2 +- + drivers/block/rnbd/rnbd-srv-sysfs.c | 2 +- + drivers/block/ublk_drv.c | 2 +- + drivers/block/zram/zram_drv.c | 12 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 6 +- + drivers/char/bsr.c | 2 +- + drivers/char/dsp56k.c | 2 +- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/lp.c | 2 +- + drivers/char/mem.c | 2 +- + drivers/char/misc.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/char/pcmcia/scr24x_cs.c | 2 +- + drivers/char/ppdev.c | 2 +- + drivers/char/tpm/tpm-chip.c | 3 +- + drivers/char/tpm/tpm-interface.c | 6 +- + drivers/char/tpm/tpm.h | 1 + + drivers/char/virtio_console.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/char/xillybus/xillybus_class.c | 2 +- + drivers/comedi/comedi_fops.c | 2 +- + drivers/comedi/drivers/comedi_test.c | 2 +- + drivers/cpufreq/amd-pstate.c | 24 +- + drivers/cpufreq/cpufreq.c | 7 +- + drivers/cpufreq/intel_pstate.c | 7 +- + drivers/cpuidle/cpuidle.c | 2 +- + drivers/cpuidle/cpuidle.h | 2 +- + drivers/cpuidle/sysfs.c | 13 +- + drivers/crypto/hisilicon/qm.c | 2 +- + drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/cxl/core/port.c | 2 +- + drivers/dca/dca-sysfs.c | 2 +- + drivers/devfreq/devfreq-event.c | 2 +- + drivers/devfreq/devfreq.c | 2 +- + drivers/dma-buf/dma-heap.c | 2 +- + drivers/dma/idxd/compat.c | 4 +- + drivers/edac/edac_device_sysfs.c | 16 +- + drivers/edac/edac_pci_sysfs.c | 14 +- + drivers/extcon/extcon.c | 2 +- + drivers/fpga/fpga-bridge.c | 2 +- + drivers/fpga/fpga-mgr.c | 2 +- + drivers/fpga/fpga-region.c | 2 +- + drivers/gnss/core.c | 2 +- + drivers/gpio/gpiolib-sysfs.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/display/drm_dp_aux_dev.c | 2 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 4 +- + drivers/hid/hid-roccat-arvo.c | 2 +- + drivers/hid/hid-roccat-isku.c | 2 +- + drivers/hid/hid-roccat-kone.c | 2 +- + drivers/hid/hid-roccat-koneplus.c | 2 +- + drivers/hid/hid-roccat-konepure.c | 2 +- + drivers/hid/hid-roccat-kovaplus.c | 2 +- + drivers/hid/hid-roccat-pyra.c | 2 +- + drivers/hid/hid-roccat-ryos.c | 2 +- + drivers/hid/hid-roccat-savu.c | 2 +- + drivers/hid/hidraw.c | 2 +- + drivers/hv/vmbus_drv.c | 2 +- + drivers/hwmon/drivetemp.c | 4 +- + drivers/hwmon/hwmon.c | 1 - + drivers/i2c/i2c-dev.c | 2 +- + drivers/infiniband/core/user_mad.c | 4 +- + drivers/infiniband/core/uverbs_main.c | 2 +- + drivers/infiniband/hw/hfi1/device.c | 4 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- + drivers/iommu/iommu.c | 14 +- + drivers/irqchip/irq-mbigen.c | 13 +- + drivers/isdn/capi/capi.c | 2 +- + drivers/isdn/mISDN/core.c | 7 - + drivers/isdn/mISDN/dsp_pipeline.c | 2 +- + drivers/leds/led-class.c | 2 +- + drivers/macintosh/adb.c | 2 +- + drivers/media/dvb-core/dvbdev.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 1 - + drivers/media/rc/lirc_dev.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-main.c | 18 +- + drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 59 ++-- + drivers/media/usb/pvrusb2/pvrusb2-sysfs.h | 16 +- + drivers/mfd/cros_ec_dev.c | 1 - + drivers/misc/c2port/core.c | 2 +- + drivers/misc/cxl/file.c | 2 +- + drivers/misc/enclosure.c | 1 - + drivers/misc/genwqe/card_base.c | 2 +- + drivers/misc/hpilo.c | 2 +- + drivers/misc/mei/main.c | 2 +- + drivers/misc/ocxl/file.c | 2 +- + drivers/misc/phantom.c | 2 +- + drivers/misc/uacce/uacce.c | 2 +- + drivers/most/most_cdev.c | 2 +- + drivers/mtd/mtdcore.c | 1 - + drivers/mtd/ubi/build.c | 3 +- + drivers/mux/core.c | 1 - + drivers/net/bonding/bond_sysfs.c | 18 +- + drivers/net/ethernet/hisilicon/hns/hnae.c | 2 +- + drivers/net/ipvlan/ipvtap.c | 1 - + drivers/net/macvtap.c | 1 - + drivers/net/netdevsim/bus.c | 4 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/rionet.c | 3 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 2 +- + drivers/net/wwan/wwan_core.c | 2 +- + drivers/net/wwan/wwan_hwsim.c | 2 +- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 6 +- + drivers/nvdimm/bus.c | 2 +- + drivers/nvme/host/core.c | 6 +- + drivers/nvme/host/fabrics.c | 2 +- + drivers/nvme/host/fc.c | 1 - + drivers/nvme/target/fcloop.c | 2 +- + drivers/pci/endpoint/pci-epc-core.c | 2 +- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.c | 4 +- + drivers/pci/switch/switchtec.c | 2 +- + drivers/pcmcia/cs.c | 2 +- + drivers/pcmcia/ds.c | 6 +- + drivers/pcmcia/rsrc_nonstatic.c | 6 +- + drivers/peci/sysfs.c | 2 +- + drivers/phy/phy-core.c | 2 +- + drivers/platform/chrome/wilco_ec/event.c | 1 - + drivers/platform/chrome/wilco_ec/telemetry.c | 1 - + drivers/platform/x86/ibm_rtl.c | 18 +- + drivers/platform/x86/intel/pmt/class.c | 1 - + .../uncore-frequency/uncore-frequency-common.c | 12 +- + drivers/platform/x86/intel_scu_ipc.c | 1 - + drivers/power/supply/power_supply_core.c | 2 +- + drivers/pps/pps.c | 2 +- + drivers/ptp/ptp_clock.c | 2 +- + drivers/ptp/ptp_ocp.c | 1 - + drivers/pwm/sysfs.c | 1 - + drivers/rapidio/devices/rio_mport_cdev.c | 9 +- + drivers/rapidio/rio-driver.c | 1 - + drivers/rapidio/rio-sysfs.c | 2 +- + drivers/rapidio/rio_cm.c | 10 +- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rtc/class.c | 2 +- + drivers/s390/char/hmcdrv_dev.c | 2 +- + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/tape_class.c | 2 +- + drivers/s390/char/vmlogrdr.c | 2 +- + drivers/s390/char/vmur.c | 2 +- + drivers/s390/crypto/ap_bus.c | 42 +-- + drivers/s390/crypto/zcrypt_api.c | 10 +- + drivers/sbus/char/oradax.c | 2 +- + drivers/scsi/ch.c | 2 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 8 +- + drivers/scsi/fcoe/fcoe_transport.c | 6 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/sd.c | 1 - + drivers/scsi/ses.c | 6 +- + drivers/scsi/sg.c | 10 +- + drivers/sh/intc/userimask.c | 10 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 5 - + drivers/soc/qcom/rmtfs_mem.c | 1 - + drivers/spi/spi.c | 2 - + drivers/spi/spidev.c | 2 +- + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 2 +- + drivers/staging/fieldbus/dev_core.c | 1 - + drivers/staging/greybus/authentication.c | 2 +- + drivers/staging/greybus/fw-management.c | 2 +- + drivers/staging/greybus/loopback.c | 1 - + drivers/staging/greybus/raw.c | 2 +- + drivers/staging/greybus/vibrator.c | 1 - + drivers/staging/pi433/pi433_if.c | 2 +- + drivers/staging/vme_user/vme_user.c | 2 +- + drivers/tee/tee_core.c | 2 +- + drivers/tty/pty.c | 2 +- + drivers/tty/tty_io.c | 24 +- + drivers/tty/vt/vc_screen.c | 2 +- + drivers/tty/vt/vt.c | 4 +- + drivers/usb/common/ulpi.c | 2 +- + drivers/usb/core/driver.c | 2 +- + drivers/usb/core/file.c | 2 +- + drivers/usb/core/usb.h | 2 +- + drivers/usb/gadget/function/f_hid.c | 2 +- + drivers/usb/gadget/function/f_printer.c | 2 +- + drivers/usb/gadget/udc/core.c | 6 +- + drivers/usb/mon/mon_bin.c | 2 +- + drivers/usb/roles/class.c | 2 +- + drivers/usb/serial/bus.c | 2 +- + drivers/usb/typec/bus.c | 2 +- + drivers/usb/typec/bus.h | 2 +- + drivers/usb/typec/class.c | 1 - + drivers/usb/typec/mux.c | 1 - + drivers/usb/typec/pd.c | 1 - + drivers/usb/typec/retimer.c | 1 - + drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- + drivers/vfio/group.c | 2 +- + drivers/vfio/vfio_main.c | 2 +- + drivers/vhost/vdpa.c | 2 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/lcd.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 2 +- + drivers/watchdog/watchdog_dev.c | 1 - + fs/coda/psdev.c | 2 +- + fs/fuse/cuse.c | 2 +- + fs/kernfs/dir.c | 26 +- + fs/kernfs/file.c | 4 +- + fs/kernfs/inode.c | 16 +- + fs/kernfs/kernfs-internal.h | 2 + + fs/kernfs/mount.c | 8 +- + fs/ksmbd/server.c | 11 +- + fs/pstore/pmsg.c | 2 +- + include/linux/device.h | 32 ++- + include/linux/device/bus.h | 21 +- + include/linux/device/class.h | 130 +++------ + include/linux/device/driver.h | 28 +- + include/linux/iommu.h | 10 +- + include/linux/kobject.h | 59 ++-- + include/linux/property.h | 9 +- + include/linux/tty.h | 2 +- + include/linux/usb/serial.h | 2 +- + include/scsi/libfcoe.h | 6 +- + init/Kconfig | 38 --- + kernel/cpu.c | 23 +- + kernel/ksysfs.c | 22 +- + kernel/sched/debug.c | 52 +++- + kernel/time/alarmtimer.c | 3 +- + kernel/workqueue.c | 8 +- + lib/kobject.c | 34 +-- + mm/backing-dev.c | 2 +- + net/bluetooth/hci_sysfs.c | 2 +- + net/netfilter/xt_IDLETIMER.c | 2 +- + net/wireless/sysfs.c | 1 - + samples/vfio-mdev/mbochs.c | 2 +- + samples/vfio-mdev/mdpy.c | 2 +- + samples/vfio-mdev/mtty.c | 2 +- + sound/sound_core.c | 2 +- + tools/testing/nvdimm/test/ndtest.c | 2 +- + tools/testing/nvdimm/test/nfit.c | 2 +- + 292 files changed, 1499 insertions(+), 1214 deletions(-) +$ git am -3 ../patches/0001-fixup-for-driver-core-bus-mark-the-struct-bus_type-f.patch +Applying: fixup for "driver core: bus: mark the struct bus_type for sysfs callbacks as constant" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/s390/crypto/ap_bus.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master b67333d880b20] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + Date: Fri Apr 14 16:02:51 2023 +0100 +$ git am -3 ../patches/0001-fixup-for-driver-core-class-remove-module-from-class.patch +Applying: fixup for "driver core: class: remove module * from class_create()" +Using index info to reconstruct a base tree... +A drivers/accel/qaic/mhi_qaic_ctrl.c +Falling back to patching base and 3-way merge... +CONFLICT (modify/delete): drivers/accel/qaic/mhi_qaic_ctrl.c deleted in HEAD and modified in fixup for "driver core: class: remove module * from class_create()". Version fixup for "driver core: class: remove module * from class_create()" of drivers/accel/qaic/mhi_qaic_ctrl.c left in tree. +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 fixup for "driver core: class: remove module * from class_create()" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging usb/usb-next (8e86652e3e715 Merge 6.3-rc6 into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging include/linux/usb.h +Removing drivers/usb/misc/ftdi-elan.c +Removing drivers/usb/host/u132-hcd.c +Auto-merging drivers/usb/gadget/udc/core.c +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging arch/mips/configs/mtx1_defconfig +Auto-merging arch/arm64/boot/dts/freescale/imx8mq.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi +Removing Documentation/devicetree/bindings/usb/usbmisc-imx.txt +Removing Documentation/devicetree/bindings/usb/typec-tcpci.txt +Auto-merging Documentation/devicetree/bindings/usb/ti,tps6598x.yaml +Auto-merging Documentation/devicetree/bindings/usb/st,stusb160x.yaml +Auto-merging Documentation/devicetree/bindings/usb/richtek,rt1719.yaml +Auto-merging Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml +Auto-merging Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +Auto-merging Documentation/devicetree/bindings/usb/mediatek,mt6360-tcpc.yaml +Auto-merging Documentation/devicetree/bindings/usb/maxim,max33359.yaml +Removing Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-usb-gadget-uvc | 4 +- + .../ABI/testing/sysfs-bus-pci-drivers-xhci_hcd | 52 + + .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 4 +- + .../devicetree/bindings/usb/brcm,bcm7445-ehci.yaml | 2 +- + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 159 - + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 447 +++ + .../devicetree/bindings/usb/fcs,fsa4480.yaml | 4 +- + .../devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml | 48 + + .../devicetree/bindings/usb/fsl,usbmisc.yaml | 68 + + .../devicetree/bindings/usb/generic-ehci.yaml | 2 +- + .../devicetree/bindings/usb/generic-ohci.yaml | 2 +- + .../devicetree/bindings/usb/generic-xhci.yaml | 2 +- + .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 4 +- + .../devicetree/bindings/usb/maxim,max33359.yaml | 4 +- + .../bindings/usb/mediatek,mt6360-tcpc.yaml | 4 +- + .../bindings/usb/mediatek,mt6370-tcpc.yaml | 4 +- + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 10 +- + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 8 +- + .../devicetree/bindings/usb/mediatek,musb.yaml | 4 +- + .../devicetree/bindings/usb/nvidia,tegra-xudc.yaml | 4 +- + .../devicetree/bindings/usb/nxp,ptn5110.yaml | 72 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 + + .../devicetree/bindings/usb/realtek,rts5411.yaml | 2 +- + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 4 +- + .../devicetree/bindings/usb/richtek,rt1719.yaml | 4 +- + .../devicetree/bindings/usb/smsc,usb3503.yaml | 54 +- + .../devicetree/bindings/usb/snps,dwc3.yaml | 28 + + .../devicetree/bindings/usb/st,stusb160x.yaml | 4 +- + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 10 +- + .../devicetree/bindings/usb/ti,keystone-dwc3.yaml | 8 - + .../devicetree/bindings/usb/ti,tps6598x.yaml | 6 +- + .../devicetree/bindings/usb/typec-tcpci.txt | 49 - + .../devicetree/bindings/usb/usb-device.yaml | 1 - + .../devicetree/bindings/usb/usb-nop-xceiv.yaml | 3 + + .../devicetree/bindings/usb/usb-xhci.yaml | 2 +- + .../devicetree/bindings/usb/usbmisc-imx.txt | 19 - + Documentation/usb/gadget_uvc.rst | 28 + + arch/arm/boot/dts/imx7ulp.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 - + arch/mips/configs/mtx1_defconfig | 2 - + arch/powerpc/configs/ppc6xx_defconfig | 2 - + drivers/usb/Kconfig | 29 - + drivers/usb/Makefile | 1 - + drivers/usb/cdns3/cdns3-debug.h | 8 +- + drivers/usb/cdns3/cdns3-trace.h | 28 +- + drivers/usb/cdns3/cdnsp-trace.h | 12 +- + drivers/usb/chipidea/Makefile | 2 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 6 +- + drivers/usb/chipidea/core.c | 2 +- + drivers/usb/chipidea/debug.c | 55 - + drivers/usb/core/usb-acpi.c | 12 +- + drivers/usb/dwc2/hcd_queue.c | 2 +- + drivers/usb/dwc2/params.c | 3 +- + drivers/usb/dwc3/core.c | 12 + + drivers/usb/dwc3/core.h | 9 + + drivers/usb/dwc3/debug.h | 2 + + drivers/usb/dwc3/debugfs.c | 5 + + drivers/usb/dwc3/dwc3-am62.c | 50 + + drivers/usb/dwc3/dwc3-pci.c | 136 +- + drivers/usb/dwc3/ep0.c | 19 +- + drivers/usb/dwc3/gadget.c | 134 +- + drivers/usb/dwc3/host.c | 7 +- + drivers/usb/dwc3/trace.h | 6 +- + drivers/usb/gadget/composite.c | 127 +- + drivers/usb/gadget/configfs.c | 3 + + drivers/usb/gadget/function/f_ecm.c | 22 + + drivers/usb/gadget/function/f_fs.c | 101 +- + drivers/usb/gadget/function/u_ether.c | 63 + + drivers/usb/gadget/function/u_ether.h | 4 + + drivers/usb/gadget/function/u_fs.h | 2 - + drivers/usb/gadget/function/uvc_configfs.c | 121 +- + drivers/usb/gadget/legacy/g_ffs.c | 9 - + drivers/usb/gadget/udc/aspeed-vhub/core.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/ep0.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 1 - + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 1 - + drivers/usb/gadget/udc/core.c | 27 + + drivers/usb/gadget/udc/max3420_udc.c | 2 +- + drivers/usb/gadget/udc/mv_udc_core.c | 6 +- + drivers/usb/gadget/udc/renesas_usb3.c | 26 +- + drivers/usb/gadget/udc/renesas_usbf.c | 11 - + drivers/usb/gadget/udc/rzv2m_usb3drd.c | 2 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 2 +- + drivers/usb/gadget/udc/trace.h | 5 + + drivers/usb/host/Kconfig | 27 - + drivers/usb/host/Makefile | 1 - + drivers/usb/host/ehci-ppc-of.c | 6 +- + drivers/usb/host/fsl-mph-dr-of.c | 11 +- + drivers/usb/host/max3421-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/host/pci-quirks.c | 4 +- + drivers/usb/host/u132-hcd.c | 3219 -------------------- + drivers/usb/host/xhci-dbgcap.c | 191 +- + drivers/usb/host/xhci-dbgcap.h | 4 + + drivers/usb/host/xhci-mem.c | 83 +- + drivers/usb/host/xhci-pci.c | 215 +- + drivers/usb/host/xhci-rcar.c | 36 +- + drivers/usb/host/xhci-ring.c | 1 + + drivers/usb/host/xhci-tegra.c | 17 +- + drivers/usb/host/xhci-trace.c | 1 + + drivers/usb/host/xhci-trace.h | 20 +- + drivers/usb/host/xhci.c | 202 +- + drivers/usb/host/xhci.h | 1 + + drivers/usb/misc/Kconfig | 51 +- + drivers/usb/misc/Makefile | 1 - + drivers/usb/misc/ftdi-elan.c | 2780 ----------------- + drivers/usb/misc/usb251xb.c | 43 +- + drivers/usb/misc/usb3503.c | 64 +- + drivers/usb/musb/Kconfig | 2 +- + drivers/usb/musb/da8xx.c | 6 +- + drivers/usb/musb/jz4740.c | 6 +- + drivers/usb/musb/mediatek.c | 6 +- + drivers/usb/musb/mpfs.c | 6 +- + drivers/usb/musb/musb_core.c | 5 +- + drivers/usb/musb/musb_dsps.c | 6 +- + drivers/usb/musb/omap2430.c | 8 +- + drivers/usb/musb/sunxi.c | 6 +- + drivers/usb/musb/tusb6010.c | 6 +- + drivers/usb/musb/ux500.c | 6 +- + drivers/usb/phy/phy-ab8500-usb.c | 6 +- + drivers/usb/phy/phy-am335x.c | 5 +- + drivers/usb/phy/phy-fsl-usb.c | 6 +- + drivers/usb/phy/phy-generic.c | 6 +- + drivers/usb/phy/phy-gpio-vbus-usb.c | 6 +- + drivers/usb/phy/phy-keystone.c | 6 +- + drivers/usb/phy/phy-mv-usb.c | 6 +- + drivers/usb/phy/phy-mxs-usb.c | 8 +- + drivers/usb/phy/phy-tahvo.c | 6 +- + drivers/usb/phy/phy-tegra-usb.c | 8 +- + drivers/usb/phy/phy-twl6030-usb.c | 6 +- + drivers/usb/renesas_usbhs/common.c | 2 +- + drivers/usb/serial/quatech2.c | 8 - + drivers/usb/typec/hd3ss3220.c | 2 +- + drivers/usb/typec/tcpm/fusb302.c | 4 +- + drivers/usb/typec/tcpm/tcpci_mt6360.c | 6 - + drivers/usb/typec/tcpm/tcpm.c | 4 +- + drivers/usb/typec/tipd/core.c | 51 +- + drivers/usb/typec/ucsi/Kconfig | 10 + + drivers/usb/typec/ucsi/Makefile | 1 + + drivers/usb/typec/ucsi/ucsi_acpi.c | 44 +- + drivers/usb/typec/ucsi/ucsi_glink.c | 345 +++ + include/linux/platform_data/usb3503.h | 1 + + include/linux/usb.h | 3 +- + include/linux/usb/composite.h | 8 + + include/linux/usb/gadget.h | 9 + + include/linux/usb/hcd.h | 2 - + 151 files changed, 2553 insertions(+), 7306 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt + create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml + create mode 100644 Documentation/devicetree/bindings/usb/fsl,imx8mq-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/fsl,usbmisc.yaml + create mode 100644 Documentation/devicetree/bindings/usb/nxp,ptn5110.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/typec-tcpci.txt + delete mode 100644 Documentation/devicetree/bindings/usb/usbmisc-imx.txt + delete mode 100644 drivers/usb/host/u132-hcd.c + delete mode 100644 drivers/usb/misc/ftdi-elan.c + create mode 100644 drivers/usb/typec/ucsi/ucsi_glink.c +Merging thunderbolt/next (1f15af76784cc thunderbolt: Introduce usb4_port_sb_opcode_err_to_errno() helper) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/thunderbolt/usb4.c +Auto-merging drivers/thunderbolt/switch.c +Auto-merging drivers/thunderbolt/nhi.c +Merge made by the 'recursive' strategy. + drivers/thunderbolt/acpi.c | 2 +- + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/eeprom.c | 204 ++++++++++++++++++++++-------------------- + drivers/thunderbolt/nhi.c | 3 +- + drivers/thunderbolt/switch.c | 4 +- + drivers/thunderbolt/usb4.c | 52 +++++------ + drivers/thunderbolt/xdomain.c | 24 +++-- + 7 files changed, 149 insertions(+), 142 deletions(-) +Merging usb-serial/usb-next (197b6b60ae7bc Linux 6.3-rc4) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (039535ecf18e8 Merge 6.3-rc6 into tty-next) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging include/linux/tty.h +Auto-merging drivers/tty/tty_io.c +Auto-merging arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +Merge made by the 'recursive' strategy. + Documentation/admin-guide/serial-console.rst | 36 +++- + .../bindings/serial/amlogic,meson-uart.yaml | 13 +- + .../devicetree/bindings/serial/fsl-imx-uart.yaml | 27 +++ + .../devicetree/bindings/serial/fsl-lpuart.yaml | 3 + + .../bindings/serial/qcom,serial-geni-qcom.yaml | 4 +- + .../bindings/serial/renesas,em-uart.yaml | 4 +- + .../devicetree/bindings/serial/renesas,hscif.yaml | 4 +- + .../devicetree/bindings/serial/renesas,sci.yaml | 4 +- + .../devicetree/bindings/serial/renesas,scif.yaml | 4 +- + .../devicetree/bindings/serial/renesas,scifa.yaml | 4 +- + .../devicetree/bindings/serial/renesas,scifb.yaml | 4 +- + .../devicetree/bindings/serial/serial.yaml | 4 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 4 +- + .../devicetree/bindings/serial/sprd-uart.yaml | 4 +- + .../bindings/serial/sunplus,sp7021-uart.yaml | 4 +- + Documentation/driver-api/tty/n_gsm.rst | 20 ++ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 15 +- + drivers/char/pcmcia/synclink_cs.c | 6 +- + drivers/mmc/core/sdio_uart.c | 10 +- + drivers/tty/Kconfig | 2 +- + drivers/tty/amiserial.c | 6 +- + drivers/tty/mxser.c | 6 +- + drivers/tty/n_gsm.c | 225 ++++++++++++++++++++- + drivers/tty/n_tty.c | 43 ++-- + drivers/tty/serial/8250/8250.h | 12 ++ + drivers/tty/serial/8250/8250_bcm7271.c | 18 +- + drivers/tty/serial/8250/8250_em.c | 113 ++++++++--- + drivers/tty/serial/8250/8250_port.c | 7 +- + drivers/tty/serial/Kconfig | 7 - + drivers/tty/serial/bcm63xx_uart.c | 38 ++++ + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 5 +- + drivers/tty/serial/imx.c | 48 ++--- + drivers/tty/serial/meson_uart.c | 8 +- + drivers/tty/serial/mxs-auart.c | 4 +- + drivers/tty/serial/qcom_geni_serial.c | 1 + + drivers/tty/serial/sb1250-duart.c | 2 +- + drivers/tty/serial/serial_core.c | 119 +++++------ + drivers/tty/serial/sh-sci.c | 19 +- + drivers/tty/serial/sprd_serial.c | 2 +- + drivers/tty/serial/stm32-usart.c | 6 +- + drivers/tty/serial/stm32-usart.h | 1 - + drivers/tty/serial/sunzilog.c | 4 +- + drivers/tty/serial/ucc_uart.c | 7 +- + drivers/tty/synclink_gt.c | 6 +- + drivers/tty/tty.h | 2 + + drivers/tty/tty_io.c | 24 +-- + drivers/tty/tty_ioctl.c | 54 +++-- + drivers/tty/tty_ldisc.c | 3 +- + include/linux/serial_8250.h | 45 ++--- + include/linux/serial_core.h | 15 +- + include/linux/tty.h | 2 +- + include/linux/vt_buffer.h | 2 +- + include/uapi/linux/gsmmux.h | 17 +- + 53 files changed, 730 insertions(+), 317 deletions(-) +Merging char-misc/char-misc-next (fba51482b6c0a Merge tag 'iio-for-6.4a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Removing include/uapi/linux/cm4000_cs.h +Auto-merging include/linux/of_device.h +Auto-merging include/linux/of.h +CONFLICT (content): Merge conflict in include/linux/of.h +Removing include/linux/cm4000_cs.h +Auto-merging drivers/usb/common/ulpi.c +Auto-merging drivers/tty/Kconfig +Auto-merging drivers/staging/iio/resolver/ad2s1210.c +Removing drivers/staging/iio/meter/meter.h +Removing drivers/staging/iio/meter/ade7854.h +Removing drivers/staging/iio/meter/ade7854.c +Removing drivers/staging/iio/meter/ade7854-spi.c +Removing drivers/staging/iio/meter/ade7854-i2c.c +Removing drivers/staging/iio/meter/Makefile +Removing drivers/staging/iio/meter/Kconfig +Auto-merging drivers/spi/spi.c +Auto-merging drivers/of/base.c +Auto-merging drivers/of/Makefile +CONFLICT (content): Merge conflict in drivers/of/Makefile +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/misc/mei/main.c +Auto-merging drivers/misc/mei/hdcp/mei_hdcp.c +Auto-merging drivers/misc/hpilo.c +Auto-merging drivers/misc/genwqe/card_base.c +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/iio/adc/at91-sama5d2_adc.c +Auto-merging drivers/i2c/i2c-core-of.c +Auto-merging drivers/gpu/drm/drm_mipi_dsi.c +Auto-merging drivers/fpga/fpga-bridge.c +CONFLICT (modify/delete): drivers/char/pcmcia/synclink_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/synclink_cs.c left in tree. +CONFLICT (modify/delete): drivers/char/pcmcia/scr24x_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/scr24x_cs.c left in tree. +Removing drivers/char/pcmcia/cm4040_cs.h +CONFLICT (modify/delete): drivers/char/pcmcia/cm4040_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/cm4040_cs.c left in tree. +CONFLICT (modify/delete): drivers/char/pcmcia/cm4000_cs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/char/pcmcia/cm4000_cs.c left in tree. +Removing drivers/char/pcmcia/Makefile +Removing drivers/char/pcmcia/Kconfig +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt +Removing Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt +Resolved 'drivers/of/Makefile' using previous resolution. +Recorded preimage for 'include/linux/of.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/char/pcmcia/cm4000_cs.c drivers/char/pcmcia/cm4040_cs.c drivers/char/pcmcia/scr24x_cs.c drivers/char/pcmcia/synclink_cs.c +rm 'drivers/char/pcmcia/cm4000_cs.c' +rm 'drivers/char/pcmcia/cm4040_cs.c' +rm 'drivers/char/pcmcia/scr24x_cs.c' +rm 'drivers/char/pcmcia/synclink_cs.c' +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/of.h'. +[master 5d98828a98e10] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-cdx | 56 + + Documentation/ABI/testing/sysfs-bus-iio | 13 +- + .../sysfs-bus-platform-devices-ampere-smpro | 19 +- + Documentation/ABI/testing/sysfs-driver-zynqmp-fpga | 73 + + .../bindings/bus/xlnx,versal-net-cdx.yaml | 82 + + .../bindings/iio/adc/renesas,rcar-gyroadc.yaml | 60 +- + .../devicetree/bindings/iio/adc/ti,ads1100.yaml | 46 + + .../bindings/iio/addac/adi,ad74413r.yaml | 9 + + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 3 + + .../bindings/iio/light/rohm,bu27034.yaml | 46 + + .../devicetree/bindings/iio/pressure/bmp085.yaml | 2 + + .../devicetree/bindings/iio/st,st-sensors.yaml | 6 +- + .../bindings/iio/temperature/adi,ltc2983.yaml | 67 +- + .../bindings/iio/temperature/ti,tmp117.yaml | 8 +- + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 2 +- + .../bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 57 + + .../bindings/nvmem/amlogic,meson6-efuse.yaml | 57 + + .../devicetree/bindings/nvmem/amlogic-efuse.txt | 48 - + .../bindings/nvmem/amlogic-meson-mx-efuse.txt | 22 - + .../devicetree/bindings/nvmem/apple,efuses.yaml | 2 +- + .../devicetree/bindings/nvmem/brcm,nvram.yaml | 2 +- + .../bindings/nvmem/fsl,layerscape-sfp.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-iim.yaml | 2 +- + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 2 +- + .../bindings/nvmem/ingenic,jz4780-efuse.yaml | 2 +- + .../bindings/nvmem/layouts/onie,tlv-layout.yaml | 2 +- + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 2 +- + .../bindings/nvmem/microchip,sama7g5-otpc.yaml | 2 +- + .../devicetree/bindings/nvmem/mxs-ocotp.yaml | 2 +- + .../devicetree/bindings/nvmem/nintendo-otp.yaml | 2 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 4 +- + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 33 +- + Documentation/devicetree/bindings/nvmem/rmem.yaml | 2 +- + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 2 +- + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 2 +- + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 2 +- + .../bindings/nvmem/sunplus,sp7021-ocotp.yaml | 2 +- + .../devicetree/bindings/nvmem/u-boot,env.yaml | 7 +- + Documentation/driver-api/nvmem.rst | 15 + + Documentation/process/magic-number.rst | 1 - + .../translations/it_IT/process/magic-number.rst | 1 - + .../translations/sp_SP/process/magic-number.rst | 1 - + .../translations/zh_CN/process/magic-number.rst | 1 - + .../translations/zh_TW/process/magic-number.rst | 1 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 51 +- + arch/powerpc/configs/ppc6xx_defconfig | 2 - + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/bus.c | 7 +- + drivers/cdx/Kconfig | 19 + + drivers/cdx/Makefile | 8 + + drivers/cdx/cdx.c | 535 +++ + drivers/cdx/cdx.h | 62 + + drivers/cdx/controller/Kconfig | 31 + + drivers/cdx/controller/Makefile | 9 + + drivers/cdx/controller/bitfield.h | 90 + + drivers/cdx/controller/cdx_controller.c | 230 ++ + drivers/cdx/controller/cdx_controller.h | 30 + + drivers/cdx/controller/cdx_rpmsg.c | 202 + + drivers/cdx/controller/mc_cdx_pcol.h | 590 +++ + drivers/cdx/controller/mcdi.c | 903 ++++ + drivers/cdx/controller/mcdi.h | 248 ++ + drivers/cdx/controller/mcdi_functions.c | 139 + + drivers/cdx/controller/mcdi_functions.h | 61 + + drivers/char/Kconfig | 2 - + drivers/char/Makefile | 1 - + drivers/char/pcmcia/Kconfig | 68 - + drivers/char/pcmcia/Makefile | 11 - + drivers/char/pcmcia/cm4000_cs.c | 1912 --------- + drivers/char/pcmcia/cm4040_cs.c | 684 ---- + drivers/char/pcmcia/cm4040_cs.h | 48 - + drivers/char/pcmcia/scr24x_cs.c | 359 -- + drivers/char/pcmcia/synclink_cs.c | 4290 -------------------- + drivers/firmware/dmi-sysfs.c | 4 +- + drivers/firmware/edd.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 33 + + drivers/fpga/fpga-bridge.c | 2 +- + drivers/fpga/zynqmp-fpga.c | 21 + + drivers/gpu/drm/drm_mipi_dsi.c | 2 +- + drivers/hsi/hsi_core.c | 2 +- + drivers/i2c/busses/i2c-powermac.c | 2 +- + drivers/i2c/i2c-core-of.c | 2 +- + drivers/iio/Kconfig | 3 + + drivers/iio/Makefile | 1 + + drivers/iio/accel/bma400_core.c | 2 +- + drivers/iio/accel/kionix-kx022a.c | 3 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/accel/msa311.c | 2 +- + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 5 + + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad7606.c | 2 +- + drivers/iio/adc/at91-sama5d2_adc.c | 8 +- + drivers/iio/adc/axp20x_adc.c | 77 +- + drivers/iio/adc/max11410.c | 2 +- + drivers/iio/adc/meson_saradc.c | 21 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 2 +- + drivers/iio/adc/rcar-gyroadc.c | 2 +- + drivers/iio/adc/stm32-adc.c | 6 +- + drivers/iio/adc/ti-ads1100.c | 445 ++ + drivers/iio/addac/Kconfig | 2 + + drivers/iio/addac/ad74413r.c | 44 +- + drivers/iio/addac/stx104.c | 462 ++- + drivers/iio/chemical/sps30_i2c.c | 6 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +- + drivers/iio/dac/Kconfig | 1 + + drivers/iio/dac/ad5592r-base.c | 5 + + drivers/iio/dac/cio-dac.c | 68 +- + drivers/iio/dac/max5522.c | 2 +- + drivers/iio/frequency/admv1013.c | 21 +- + drivers/iio/gyro/fxas21002c_core.c | 2 +- + drivers/iio/gyro/mpu3050-core.c | 2 +- + drivers/iio/humidity/hts221_buffer.c | 2 +- + drivers/iio/imu/adis16475.c | 6 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 13 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 59 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 22 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/industrialio-gts-helper.c | 1077 +++++ + drivers/iio/industrialio-trigger.c | 17 +- + drivers/iio/light/Kconfig | 14 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/acpi-als.c | 2 +- + drivers/iio/light/max44009.c | 13 +- + drivers/iio/light/rohm-bu27034.c | 1497 +++++++ + drivers/iio/light/rpr0521.c | 2 +- + drivers/iio/light/st_uvis25_core.c | 2 +- + drivers/iio/light/vcnl4000.c | 2 +- + drivers/iio/light/vcnl4035.c | 2 +- + drivers/iio/potentiostat/lmp91000.c | 2 +- + drivers/iio/pressure/Kconfig | 6 +- + drivers/iio/pressure/bmp280-core.c | 765 +++- + drivers/iio/pressure/bmp280-i2c.c | 45 +- + drivers/iio/pressure/bmp280-regmap.c | 60 + + drivers/iio/pressure/bmp280-spi.c | 47 +- + drivers/iio/pressure/bmp280.h | 273 +- + drivers/iio/pressure/zpa2326.c | 2 +- + drivers/iio/proximity/as3935.c | 2 +- + drivers/iio/proximity/sx9324.c | 96 +- + drivers/iio/proximity/sx9360.c | 32 +- + drivers/iio/proximity/sx9500.c | 4 +- + drivers/iio/proximity/sx_common.c | 21 + + drivers/iio/proximity/sx_common.h | 6 +- + drivers/iio/temperature/tmp117.c | 80 +- + drivers/iio/trigger/iio-trig-loop.c | 2 +- + drivers/iommu/iommu.c | 4 + + drivers/misc/cardreader/alcor_pci.c | 167 +- + drivers/misc/genwqe/card_base.c | 2 - + drivers/misc/hpilo.c | 6 - + drivers/misc/lis3lv02d/lis3lv02d.c | 66 +- + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 10 +- + drivers/misc/mei/bus-fixup.c | 2 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- + drivers/misc/mei/hw.h | 2 +- + drivers/misc/mei/main.c | 1 - + drivers/misc/mei/pxp/mei_pxp.c | 2 +- + drivers/misc/sgi-xp/xpc_main.c | 24 +- + drivers/misc/smpro-errmon.c | 82 + + drivers/misc/sram.c | 28 +- + drivers/misc/sram.h | 1 - + drivers/misc/vmw_vmci/vmci_host.c | 8 +- + drivers/nvmem/Kconfig | 7 +- + drivers/nvmem/Makefile | 1 + + drivers/nvmem/bcm-ocotp.c | 4 +- + drivers/nvmem/core.c | 169 +- + drivers/nvmem/imx-ocotp.c | 30 +- + drivers/nvmem/layouts/Kconfig | 23 + + drivers/nvmem/layouts/Makefile | 7 + + drivers/nvmem/layouts/onie-tlv.c | 244 ++ + drivers/nvmem/layouts/sl28vpd.c | 153 + + drivers/nvmem/mtk-efuse.c | 53 +- + drivers/nvmem/nintendo-otp.c | 4 +- + drivers/nvmem/stm32-romem.c | 2 +- + drivers/nvmem/u-boot-env.c | 26 + + drivers/nvmem/vf610-ocotp.c | 3 +- + drivers/of/Makefile | 2 +- + drivers/of/base.c | 18 +- + drivers/of/device.c | 75 +- + drivers/of/module.c | 74 + + drivers/spi/spi.c | 4 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/meter/Kconfig | 37 - + drivers/staging/iio/meter/Makefile | 8 - + drivers/staging/iio/meter/ade7854-i2c.c | 153 - + drivers/staging/iio/meter/ade7854-spi.c | 160 - + drivers/staging/iio/meter/ade7854.c | 556 --- + drivers/staging/iio/meter/ade7854.h | 173 - + drivers/staging/iio/meter/meter.h | 398 -- + drivers/staging/iio/resolver/ad2s1210.c | 2 +- + drivers/tty/Kconfig | 9 + + drivers/usb/common/ulpi.c | 2 +- + include/linux/alcor_pci.h | 7 - + include/linux/cdx/cdx_bus.h | 174 + + include/linux/cm4000_cs.h | 11 - + include/linux/firmware/xlnx-zynqmp.h | 11 + + include/linux/iio/iio-gts-helper.h | 206 + + include/linux/iio/trigger.h | 8 +- + include/linux/mod_devicetable.h | 16 + + include/linux/nvmem-consumer.h | 7 + + include/linux/nvmem-provider.h | 74 +- + include/linux/of.h | 18 +- + include/linux/of_device.h | 6 - + include/linux/uuid.h | 3 - + include/uapi/linux/cm4000_cs.h | 64 - + include/uapi/linux/mei.h | 2 +- + include/uapi/linux/mei_uuid.h | 29 + + include/uapi/linux/uuid.h | 31 +- + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 12 + + 216 files changed, 10098 insertions(+), 10237 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-cdx + create mode 100644 Documentation/ABI/testing/sysfs-driver-zynqmp-fpga + create mode 100644 Documentation/devicetree/bindings/bus/xlnx,versal-net-cdx.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads1100.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bu27034.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt + delete mode 100644 Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt + create mode 100644 drivers/cdx/Kconfig + create mode 100644 drivers/cdx/Makefile + create mode 100644 drivers/cdx/cdx.c + create mode 100644 drivers/cdx/cdx.h + create mode 100644 drivers/cdx/controller/Kconfig + create mode 100644 drivers/cdx/controller/Makefile + create mode 100644 drivers/cdx/controller/bitfield.h + create mode 100644 drivers/cdx/controller/cdx_controller.c + create mode 100644 drivers/cdx/controller/cdx_controller.h + create mode 100644 drivers/cdx/controller/cdx_rpmsg.c + create mode 100644 drivers/cdx/controller/mc_cdx_pcol.h + create mode 100644 drivers/cdx/controller/mcdi.c + create mode 100644 drivers/cdx/controller/mcdi.h + create mode 100644 drivers/cdx/controller/mcdi_functions.c + create mode 100644 drivers/cdx/controller/mcdi_functions.h + delete mode 100644 drivers/char/pcmcia/Kconfig + delete mode 100644 drivers/char/pcmcia/Makefile + delete mode 100644 drivers/char/pcmcia/cm4000_cs.c + delete mode 100644 drivers/char/pcmcia/cm4040_cs.c + delete mode 100644 drivers/char/pcmcia/cm4040_cs.h + delete mode 100644 drivers/char/pcmcia/scr24x_cs.c + delete mode 100644 drivers/char/pcmcia/synclink_cs.c + create mode 100644 drivers/iio/adc/ti-ads1100.c + create mode 100644 drivers/iio/industrialio-gts-helper.c + create mode 100644 drivers/iio/light/rohm-bu27034.c + create mode 100644 drivers/nvmem/layouts/Kconfig + create mode 100644 drivers/nvmem/layouts/Makefile + create mode 100644 drivers/nvmem/layouts/onie-tlv.c + create mode 100644 drivers/nvmem/layouts/sl28vpd.c + create mode 100644 drivers/of/module.c + delete mode 100644 drivers/staging/iio/meter/Kconfig + delete mode 100644 drivers/staging/iio/meter/Makefile + delete mode 100644 drivers/staging/iio/meter/ade7854-i2c.c + delete mode 100644 drivers/staging/iio/meter/ade7854-spi.c + delete mode 100644 drivers/staging/iio/meter/ade7854.c + delete mode 100644 drivers/staging/iio/meter/ade7854.h + delete mode 100644 drivers/staging/iio/meter/meter.h + create mode 100644 include/linux/cdx/cdx_bus.h + delete mode 100644 include/linux/cm4000_cs.h + create mode 100644 include/linux/iio/iio-gts-helper.h + delete mode 100644 include/uapi/linux/cm4000_cs.h + create mode 100644 include/uapi/linux/mei_uuid.h +$ git am -3 ../patches/cdx-change-struct-bus_type-for-sysfs-rescon-callback-as-constant.patch +Applying: cdx: change struct bus_type for sysfs rescan callback as constant +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/cdx/cdx.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 02c4a0e10b775] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git + Date: Fri Apr 14 16:13:40 2023 +0100 +Merging accel/habanalabs-next (56499c4615896 accel/habanalabs: add missing error flow in hl_sysfs_init()) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (18996a113f256 coresight: etm_pmu: Set the module field) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging MAINTAINERS +Auto-merging CREDITS +Merge made by the 'recursive' strategy. + CREDITS | 5 +++++ + MAINTAINERS | 1 - + drivers/hwtracing/coresight/coresight-etm-perf.c | 1 + + 3 files changed, 6 insertions(+), 1 deletion(-) +Merging fpga/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (b7590f3841f47 dt-bindings: interconnect: qcom,msm8998-bwmon: Resolve MSM8998 support) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Auto-merging drivers/interconnect/core.c +Merge made by the 'recursive' strategy. + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 41 +++++++++-- + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + drivers/interconnect/core.c | 81 +++------------------- + drivers/interconnect/qcom/Kconfig | 2 +- + drivers/interconnect/qcom/icc-rpm.c | 38 +++++----- + drivers/interconnect/qcom/icc-rpm.h | 17 +++-- + drivers/interconnect/qcom/msm8996.c | 1 - + drivers/interconnect/qcom/osm-l3.c | 7 -- + drivers/interconnect/qcom/sc7180.h | 2 - + drivers/interconnect/qcom/sc7280.h | 2 - + drivers/interconnect/qcom/sc8180x.h | 2 - + drivers/interconnect/qcom/sdm845.h | 2 - + drivers/interconnect/qcom/sm8150.h | 2 - + drivers/interconnect/qcom/sm8250.h | 2 - + include/linux/interconnect-provider.h | 17 ----- + 15 files changed, 76 insertions(+), 141 deletions(-) +Merging iio/togreg (c86b0e73f0beb MAINTAINERS: Add ROHM BU27034) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (a010613237212 phy: cadence: cdns-dphy-rx: Add common module reset support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Removing drivers/phy/intel/phy-intel-thunderbay-emmc.c +Auto-merging drivers/phy/intel/phy-intel-lgm-combo.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/phy/marvell,armada-cp110-utmi-phy.yaml +Removing Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/rockchip-dw-pcie.yaml | 6 +- + .../bindings/phy/allwinner,sun50i-h6-usb3-phy.yaml | 4 +- + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 2 +- + .../bindings/phy/amlogic,axg-mipi-dphy.yaml | 4 +- + .../phy/amlogic,g12a-mipi-dphy-analog.yaml | 4 +- + .../bindings/phy/amlogic,g12a-usb2-phy.yaml | 4 +- + .../bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml | 4 +- + .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 4 +- + .../bindings/phy/amlogic,meson-axg-pcie.yaml | 4 +- + .../bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml | 4 +- + .../bindings/phy/amlogic,meson8b-usb2-phy.yaml | 4 +- + .../bindings/phy/brcm,bcm63xx-usbh-phy.yaml | 4 +- + .../devicetree/bindings/phy/brcm,sata-phy.yaml | 4 +- + .../devicetree/bindings/phy/cdns,salvo-phy.yaml | 4 +- + .../bindings/phy/hisilicon,hi3660-usb3.yaml | 4 +- + .../bindings/phy/hisilicon,hi3670-usb3.yaml | 6 +- + .../bindings/phy/intel,phy-thunderbay-emmc.yaml | 45 -- + .../bindings/phy/marvell,armada-3700-utmi-phy.yaml | 4 +- + .../phy/marvell,armada-cp110-utmi-phy.yaml | 4 +- + .../bindings/phy/marvell,mmp3-hsic-phy.yaml | 4 +- + .../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 1 + + .../bindings/phy/mediatek,mt7621-pci-phy.yaml | 4 +- + .../bindings/phy/phy-cadence-sierra.yaml | 12 +- + .../bindings/phy/phy-cadence-torrent.yaml | 10 +- + .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 1 + + .../devicetree/bindings/phy/phy-tegra194-p2u.yaml | 4 +- + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 4 +- + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 4 +- + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 1 + + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 27 +- + .../devicetree/bindings/phy/qcom,usb-hs-28nm.yaml | 4 +- + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 4 +- + .../devicetree/bindings/phy/qcom,usb-ss.yaml | 4 +- + .../bindings/phy/qcom-usb-ipq4019-phy.yaml | 4 +- + .../bindings/phy/samsung,exynos-pcie-phy.yaml | 4 +- + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 2 +- + .../bindings/phy/sunplus,sp7021-usb2-phy.yaml | 4 +- + .../bindings/phy/ti,phy-am654-serdes.yaml | 5 - + .../devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 8 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 25 +- + .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 4 +- + MAINTAINERS | 7 - + drivers/phy/Kconfig | 2 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 8 +- + drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c | 4 +- + drivers/phy/broadcom/phy-bcm-ns-usb2.c | 2 +- + drivers/phy/broadcom/phy-brcm-usb.c | 6 +- + drivers/phy/cadence/cdns-dphy-rx.c | 32 ++ + drivers/phy/cadence/cdns-dphy.c | 6 +- + drivers/phy/cadence/phy-cadence-sierra.c | 250 +++++++--- + drivers/phy/cadence/phy-cadence-torrent.c | 6 +- + drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c | 6 +- + drivers/phy/intel/Kconfig | 10 - + drivers/phy/intel/Makefile | 1 - + drivers/phy/intel/phy-intel-lgm-combo.c | 5 +- + drivers/phy/intel/phy-intel-thunderbay-emmc.c | 509 --------------------- + drivers/phy/marvell/phy-pxa-28nm-hsic.c | 2 +- + drivers/phy/marvell/phy-pxa-28nm-usb2.c | 2 +- + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c | 495 ++++++++++++++++++++ + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.h | 113 +++++ + drivers/phy/mediatek/phy-mtk-hdmi.c | 15 + + drivers/phy/mediatek/phy-mtk-hdmi.h | 3 + + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 5 +- + drivers/phy/motorola/phy-cpcap-usb.c | 6 +- + drivers/phy/motorola/phy-mapphone-mdm6600.c | 6 +- + drivers/phy/phy-lgm-usb.c | 6 +- + drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 6 +- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 8 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-sata.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 19 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 263 ++++++++++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4_20.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h | 1 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_20.h | 24 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 98 ++++ + drivers/phy/renesas/phy-rcar-gen3-pcie.c | 6 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 6 +- + drivers/phy/renesas/phy-rcar-gen3-usb3.c | 6 +- + drivers/phy/renesas/r8a779f0-ether-serdes.c | 6 +- + drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 6 +- + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 11 +- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 6 +- + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 184 ++++++++ + drivers/phy/rockchip/phy-rockchip-pcie.c | 15 - + drivers/phy/rockchip/phy-rockchip-typec.c | 6 +- + drivers/phy/st/phy-miphy28lp.c | 42 +- + drivers/phy/st/phy-spear1310-miphy.c | 2 +- + drivers/phy/st/phy-spear1340-miphy.c | 2 +- + drivers/phy/st/phy-stm32-usbphyc.c | 9 +- + drivers/phy/tegra/xusb-tegra186.c | 20 + + drivers/phy/tegra/xusb.c | 8 +- + drivers/phy/tegra/xusb.h | 1 + + drivers/phy/ti/phy-am654-serdes.c | 6 +- + drivers/phy/ti/phy-da8xx-usb.c | 6 +- + drivers/phy/ti/phy-dm816x-usb.c | 6 +- + drivers/phy/ti/phy-j721e-wiz.c | 19 +- + drivers/phy/ti/phy-omap-usb2.c | 14 +- + drivers/phy/ti/phy-ti-pipe3.c | 6 +- + drivers/phy/ti/phy-twl4030-usb.c | 6 +- + drivers/phy/xilinx/phy-zynqmp.c | 5 +- + 102 files changed, 1628 insertions(+), 973 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/intel,phy-thunderbay-emmc.yaml + delete mode 100644 drivers/phy/intel/phy-intel-thunderbay-emmc.c + create mode 100644 drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c + create mode 100644 drivers/phy/mediatek/phy-mtk-hdmi-mt8195.h +Merging soundwire/next (67572c8dc6441 soundwire: intel_auxdevice: improve pm_prepare step) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'recursive' strategy. + drivers/soundwire/Kconfig | 10 + + drivers/soundwire/Makefile | 7 +- + drivers/soundwire/amd_manager.c | 1208 ++++++++++++++++++++++ + drivers/soundwire/amd_manager.h | 258 +++++ + drivers/soundwire/bus.c | 112 +- + drivers/soundwire/bus.h | 20 +- + drivers/soundwire/cadence_master.c | 139 ++- + drivers/soundwire/cadence_master.h | 5 +- + drivers/soundwire/dmi-quirks.c | 25 + + drivers/soundwire/generic_bandwidth_allocation.c | 15 +- + drivers/soundwire/intel.c | 336 +----- + drivers/soundwire/intel.h | 67 ++ + drivers/soundwire/intel_auxdevice.c | 6 +- + drivers/soundwire/intel_bus_common.c | 259 +++++ + drivers/soundwire/qcom.c | 20 +- + drivers/soundwire/stream.c | 20 +- + include/linux/soundwire/sdw_amd.h | 109 ++ + include/linux/soundwire/sdw_intel.h | 11 + + 18 files changed, 2189 insertions(+), 438 deletions(-) + create mode 100644 drivers/soundwire/amd_manager.c + create mode 100644 drivers/soundwire/amd_manager.h + create mode 100644 drivers/soundwire/intel_bus_common.c + create mode 100644 include/linux/soundwire/sdw_amd.h +Merging extcon/extcon-next (22349cb0b86e6 extcon: Remove dup device name in the message and unneeded error check) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Auto-merging drivers/extcon/extcon.c +CONFLICT (content): Merge conflict in drivers/extcon/extcon.c +Resolved 'drivers/extcon/extcon.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1a1823e3b4d5f] Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/extcon/qcom,pm8941-misc.yaml | 14 +- + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-palmas.c | 1 - + drivers/extcon/extcon-qcom-spmi-misc.c | 4 +- + drivers/extcon/extcon-usbc-tusb320.c | 153 +++++++-- + drivers/extcon/extcon.c | 355 ++++++++++++--------- + drivers/extcon/extcon.h | 6 +- + 8 files changed, 342 insertions(+), 194 deletions(-) +Merging gnss/gnss-next (1b929c02afd37 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (99aec4a010478 vfio: correct kdoc for ops structures) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Merge made by the 'recursive' strategy. + Documentation/virt/kvm/devices/vfio.rst | 7 +++++++ + drivers/vfio/pci/vfio_pci_config.c | 7 +++++++ + include/linux/vfio.h | 5 +++++ + 3 files changed, 19 insertions(+) +Merging staging/staging-next (41500f4535627 staging: rtl8192e: Add blank lines after declarations) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Removing drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h +Auto-merging drivers/staging/iio/resolver/ad2s1210.c +Auto-merging drivers/staging/fieldbus/anybuss/arcx-anybus.c +Merge made by the 'recursive' strategy. + drivers/staging/axis-fifo/axis-fifo.c | 34 +- + drivers/staging/emxx_udc/emxx_udc.c | 6 +- + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 5 +- + drivers/staging/greybus/arche-apb-ctrl.c | 6 +- + drivers/staging/greybus/arche-platform.c | 6 +- + drivers/staging/greybus/audio_manager_module.c | 47 +- + drivers/staging/greybus/audio_topology.c | 5 +- + drivers/staging/greybus/gpio.c | 7 +- + drivers/staging/greybus/greybus_authentication.h | 1 - + drivers/staging/greybus/pwm.c | 6 +- + drivers/staging/ks7010/ks_hostif.c | 5 +- + drivers/staging/most/dim2/dim2.c | 15 +- + drivers/staging/most/dim2/hal.c | 5 +- + drivers/staging/most/i2c/i2c.c | 5 +- + drivers/staging/most/video/video.c | 3 +- + drivers/staging/nvec/nvec.c | 6 +- + drivers/staging/nvec/nvec_kbd.c | 6 +- + drivers/staging/nvec/nvec_paz00.c | 5 +- + drivers/staging/nvec/nvec_power.c | 6 +- + drivers/staging/nvec/nvec_ps2.c | 6 +- + drivers/staging/octeon/ethernet.c | 5 +- + drivers/staging/octeon/octeon-stubs.h | 4 +- + drivers/staging/qlge/qlge_dbg.c | 35 +- + drivers/staging/rtl8192e/rtl8192e/Makefile | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 11 - + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 10 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 82 +-- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 - + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 7 - + drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 33 -- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 614 ++++++--------------- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 32 -- + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 37 -- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 179 ++---- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 59 -- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 160 ++---- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 3 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 8 +- + .../rtl8192e/rtl8192e/{r8192E_hwimg.c => table.c} | 22 +- + drivers/staging/rtl8192e/rtl8192e/table.h | 27 + + drivers/staging/rtl8192e/rtl819x_TSProc.c | 3 +- + drivers/staging/rtl8192e/rtllib.h | 41 +- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 32 +- + drivers/staging/rtl8192e/rtllib_rx.c | 80 ++- + drivers/staging/rtl8192e/rtllib_softmac.c | 47 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 12 +- + drivers/staging/rtl8192e/rtllib_wx.c | 42 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 38 -- + drivers/staging/rtl8192u/r8192U_dm.c | 244 +------- + drivers/staging/rtl8192u/r8192U_dm.h | 1 - + drivers/staging/rtl8192u/r819xU_phy.c | 87 --- + drivers/staging/rtl8192u/r819xU_phy.h | 2 - + drivers/staging/rtl8712/rtl871x_mlme.c | 97 ++-- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 17 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 8 - + drivers/staging/rtl8723bs/hal/hal_com.c | 108 ---- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - + drivers/staging/rtl8723bs/include/drv_types.h | 6 +- + drivers/staging/rtl8723bs/include/hal_btcoex.h | 1 - + drivers/staging/rtl8723bs/include/hal_com.h | 9 - + drivers/staging/rtl8723bs/include/ieee80211.h | 49 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 20 - + drivers/staging/rtl8723bs/include/rtw_recv.h | 9 +- + drivers/staging/rts5208/xd.c | 7 - + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 6 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 6 +- + drivers/staging/vme_user/Kconfig | 3 +- + drivers/staging/vme_user/vme_fake.c | 5 - + drivers/staging/vme_user/vme_tsi148.c | 13 +- + drivers/staging/vme_user/vme_tsi148.h | 534 +++++++++--------- + drivers/staging/vt6655/baseband.c | 44 -- + drivers/staging/vt6655/baseband.h | 2 - + drivers/staging/vt6656/card.c | 21 - + drivers/staging/vt6656/card.h | 1 - + drivers/staging/wlan-ng/prism2fw.c | 8 +- + 77 files changed, 866 insertions(+), 2262 deletions(-) + delete mode 100644 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h + rename drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.c => table.c} (95%) + create mode 100644 drivers/staging/rtl8192e/rtl8192e/table.h +Merging counter-next/counter-next (09a9639e56c01 Linux 6.3-rc6) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (ea327624ae529 mux: mmio: drop obsolete dependency on COMPILE_TEST) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3301 and retry the command. +Merge made by the 'recursive' strategy. + drivers/mux/Kconfig | 2 +- + drivers/mux/mmio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging dmaengine/next (f2dc327131b5c dmaengine: idxd: add per wq PRS disable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/mv_xor_v2.c +Auto-merging drivers/dma/idxd/irq.c +Auto-merging drivers/dma/idxd/init.c +Auto-merging drivers/dma/idxd/idxd.h +Auto-merging drivers/dma/idxd/device.c +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 51 +++ + .../devicetree/bindings/dma/apple,admac.yaml | 1 + + .../devicetree/bindings/dma/qcom,gpi.yaml | 1 + + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 14 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 23 +- + .../devicetree/bindings/dma/ti/k3-udma.yaml | 2 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 2 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 2 +- + drivers/dma/Kconfig | 1 + + drivers/dma/at_xdmac.c | 107 +++++-- + drivers/dma/bestcomm/sram.c | 19 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 40 ++- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + + drivers/dma/dw-edma/dw-edma-core.c | 27 +- + drivers/dma/dw-edma/dw-edma-v0-core.c | 56 ---- + drivers/dma/idxd/Makefile | 2 +- + drivers/dma/idxd/cdev.c | 334 +++++++++++++++++-- + drivers/dma/idxd/debugfs.c | 138 ++++++++ + drivers/dma/idxd/device.c | 113 ++++++- + drivers/dma/idxd/idxd.h | 67 ++++ + drivers/dma/idxd/init.c | 60 +++- + drivers/dma/idxd/irq.c | 210 ++++++++++-- + drivers/dma/idxd/registers.h | 126 +++++++- + drivers/dma/idxd/sysfs.c | 146 ++++++++- + drivers/dma/imx-dma.c | 1 - + drivers/dma/ioat/init.c | 12 +- + drivers/dma/ioat/registers.h | 7 - + drivers/dma/mv_xor_v2.c | 35 +- + drivers/dma/of-dma.c | 2 +- + drivers/dma/qcom/gpi.c | 1 - + drivers/dma/qcom/hidma_mgmt.c | 2 + + drivers/dma/sh/rz-dmac.c | 18 +- + drivers/dma/tegra20-apb-dma.c | 5 - + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/edma.c | 8 - + drivers/dma/ti/k3-psil-j784s4.c | 354 +++++++++++++++++++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 75 ++++- + drivers/dma/xilinx/zynqmp_dma.c | 6 +- + include/linux/dma/ti-cppi5.h | 1 + + include/uapi/linux/idxd.h | 48 ++- + 42 files changed, 1863 insertions(+), 260 deletions(-) + create mode 100644 drivers/dma/idxd/debugfs.c + create mode 100644 drivers/dma/ti/k3-psil-j784s4.c +Merging cgroup/for-next (bad2750ad28b1 Merge branch 'for-6.3-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging mm/page_alloc.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/bpf/local_storage.c +Auto-merging kernel/bpf/cgroup.c +Merge made by the 'recursive' strategy. + kernel/bpf/cgroup.c | 38 +++++++------- + kernel/bpf/cgroup_iter.c | 4 +- + kernel/bpf/local_storage.c | 4 +- + kernel/cgroup/cgroup-v1.c | 16 +++--- + kernel/cgroup/cgroup.c | 60 +++++++++++------------ + kernel/cgroup/cpuset.c | 26 ++++++---- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 25 +++++----- + 7 files changed, 92 insertions(+), 81 deletions(-) +$ git am -3 ../patches/0001-sched-psi-fix-up-for-cgroup-Remove-CFTYPE_PRESSURE.patch +Applying: sched/psi: fix up for "cgroup: Remove CFTYPE_PRESSURE" +Using index info to reconstruct a base tree... +M kernel/cgroup/cgroup.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/cgroup/cgroup.c +No changes -- Patch already applied. +Merging scsi/for-next (97696e29e5ccf Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/xen/xen-scsiback.c +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/cxgbi/libcxgbi.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/ata/sata_dwc_460ex.c +Auto-merging drivers/ata/pata_parport/pata_parport.c +Auto-merging drivers/ata/pata_macio.c +Auto-merging drivers/ata/pata_ixp4xx_cf.c +Auto-merging drivers/ata/libahci_platform.c +Auto-merging drivers/ata/ahci_mtk.c +Auto-merging drivers/ata/ahci_imx.c +Merge made by the 'recursive' strategy. + Documentation/scsi/scsi_mid_low_api.rst | 2 +- + drivers/ata/acard-ahci.c | 2 +- + drivers/ata/ahci.c | 2 +- + drivers/ata/ahci.h | 2 +- + drivers/ata/ahci_brcm.c | 2 +- + drivers/ata/ahci_ceva.c | 2 +- + drivers/ata/ahci_da850.c | 2 +- + drivers/ata/ahci_dm816.c | 2 +- + drivers/ata/ahci_dwc.c | 2 +- + drivers/ata/ahci_imx.c | 2 +- + drivers/ata/ahci_mtk.c | 2 +- + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/ahci_platform.c | 2 +- + drivers/ata/ahci_qoriq.c | 2 +- + drivers/ata/ahci_seattle.c | 2 +- + drivers/ata/ahci_st.c | 2 +- + drivers/ata/ahci_sunxi.c | 2 +- + drivers/ata/ahci_tegra.c | 2 +- + drivers/ata/ahci_xgene.c | 2 +- + drivers/ata/ata_generic.c | 2 +- + drivers/ata/ata_piix.c | 6 +- + drivers/ata/libahci.c | 4 +- + drivers/ata/libahci_platform.c | 2 +- + drivers/ata/libata-core.c | 4 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/ata/libata-sff.c | 8 +- + drivers/ata/libata.h | 2 +- + drivers/ata/pata_acpi.c | 2 +- + drivers/ata/pata_ali.c | 2 +- + drivers/ata/pata_amd.c | 2 +- + drivers/ata/pata_arasan_cf.c | 2 +- + drivers/ata/pata_artop.c | 2 +- + drivers/ata/pata_atiixp.c | 2 +- + drivers/ata/pata_atp867x.c | 2 +- + drivers/ata/pata_buddha.c | 2 +- + drivers/ata/pata_cmd640.c | 2 +- + drivers/ata/pata_cmd64x.c | 2 +- + drivers/ata/pata_cs5520.c | 2 +- + drivers/ata/pata_cs5530.c | 2 +- + drivers/ata/pata_cs5535.c | 2 +- + drivers/ata/pata_cs5536.c | 2 +- + drivers/ata/pata_cypress.c | 2 +- + drivers/ata/pata_efar.c | 2 +- + drivers/ata/pata_ep93xx.c | 2 +- + drivers/ata/pata_falcon.c | 2 +- + drivers/ata/pata_ftide010.c | 2 +- + drivers/ata/pata_gayle.c | 2 +- + drivers/ata/pata_hpt366.c | 2 +- + drivers/ata/pata_hpt37x.c | 2 +- + drivers/ata/pata_hpt3x2n.c | 2 +- + drivers/ata/pata_hpt3x3.c | 2 +- + drivers/ata/pata_icside.c | 2 +- + drivers/ata/pata_imx.c | 2 +- + drivers/ata/pata_isapnp.c | 2 +- + drivers/ata/pata_it8213.c | 2 +- + drivers/ata/pata_it821x.c | 2 +- + drivers/ata/pata_ixp4xx_cf.c | 2 +- + drivers/ata/pata_jmicron.c | 2 +- + drivers/ata/pata_legacy.c | 2 +- + drivers/ata/pata_macio.c | 2 +- + drivers/ata/pata_marvell.c | 2 +- + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/ata/pata_mpiix.c | 2 +- + drivers/ata/pata_netcell.c | 2 +- + drivers/ata/pata_ninja32.c | 2 +- + drivers/ata/pata_ns87410.c | 2 +- + drivers/ata/pata_ns87415.c | 2 +- + drivers/ata/pata_octeon_cf.c | 2 +- + drivers/ata/pata_of_platform.c | 2 +- + drivers/ata/pata_oldpiix.c | 2 +- + drivers/ata/pata_opti.c | 2 +- + drivers/ata/pata_optidma.c | 2 +- + drivers/ata/pata_parport/pata_parport.c | 2 +- + drivers/ata/pata_pcmcia.c | 2 +- + drivers/ata/pata_pdc2027x.c | 2 +- + drivers/ata/pata_pdc202xx_old.c | 2 +- + drivers/ata/pata_piccolo.c | 2 +- + drivers/ata/pata_platform.c | 4 +- + drivers/ata/pata_pxa.c | 2 +- + drivers/ata/pata_radisys.c | 2 +- + drivers/ata/pata_rb532_cf.c | 2 +- + drivers/ata/pata_rdc.c | 2 +- + drivers/ata/pata_rz1000.c | 2 +- + drivers/ata/pata_sc1200.c | 2 +- + drivers/ata/pata_sch.c | 2 +- + drivers/ata/pata_serverworks.c | 6 +- + drivers/ata/pata_sil680.c | 2 +- + drivers/ata/pata_sis.c | 2 +- + drivers/ata/pata_sl82c105.c | 2 +- + drivers/ata/pata_triflex.c | 2 +- + drivers/ata/pata_via.c | 2 +- + drivers/ata/pdc_adma.c | 2 +- + drivers/ata/sata_dwc_460ex.c | 2 +- + drivers/ata/sata_fsl.c | 2 +- + drivers/ata/sata_highbank.c | 2 +- + drivers/ata/sata_inic162x.c | 2 +- + drivers/ata/sata_mv.c | 4 +- + drivers/ata/sata_nv.c | 8 +- + drivers/ata/sata_promise.c | 2 +- + drivers/ata/sata_qstor.c | 2 +- + drivers/ata/sata_rcar.c | 2 +- + drivers/ata/sata_sil.c | 2 +- + drivers/ata/sata_sil24.c | 2 +- + drivers/ata/sata_sis.c | 2 +- + drivers/ata/sata_svw.c | 2 +- + drivers/ata/sata_sx4.c | 2 +- + drivers/ata/sata_uli.c | 2 +- + drivers/ata/sata_via.c | 2 +- + drivers/ata/sata_vsc.c | 2 +- + drivers/firewire/sbp2.c | 4 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 4 +- + drivers/infiniband/ulp/isert/ib_isert.c | 4 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 33 - + drivers/message/fusion/mptbase.h | 1 - + drivers/message/fusion/mptfc.c | 2 +- + drivers/message/fusion/mptlan.c | 2 + + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/fusion/mptscsih.c | 1 - + drivers/message/fusion/mptspi.c | 2 +- + drivers/s390/scsi/zfcp_scsi.c | 2 +- + drivers/scsi/3w-9xxx.c | 3 +- + drivers/scsi/3w-sas.c | 3 +- + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/BusLogic.c | 4 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/a2091.c | 2 +- + drivers/scsi/a3000.c | 2 +- + drivers/scsi/aacraid/linit.c | 5 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/aha152x.c | 4 +- + drivers/scsi/aha1542.c | 5 +- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/aic94xx/aic94xx_init.c | 2 +- + drivers/scsi/am53c974.c | 2 +- + drivers/scsi/arcmsr/arcmsr.h | 3 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 24 +- + drivers/scsi/arm/acornscsi.c | 2 +- + drivers/scsi/arm/arxescsi.c | 2 +- + drivers/scsi/arm/cumana_1.c | 2 +- + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/oak.c | 2 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/atp870u.c | 4 +- + drivers/scsi/be2iscsi/be_cmds.c | 2 - + drivers/scsi/be2iscsi/be_main.c | 29 +- + drivers/scsi/be2iscsi/be_main.h | 1 - + drivers/scsi/bfa/bfad.c | 6 - + drivers/scsi/bfa/bfad_drv.h | 1 - + drivers/scsi/bnx2i/bnx2i_iscsi.c | 4 +- + drivers/scsi/csiostor/csio_init.c | 1 - + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.h | 2 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/dmx3191d.c | 2 +- + drivers/scsi/elx/efct/efct_lio.c | 20 - + drivers/scsi/elx/efct/efct_xport.c | 2 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/esp_scsi.c | 2 +- + drivers/scsi/esp_scsi.h | 2 +- + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fdomain.c | 2 +- + drivers/scsi/fnic/fnic_main.c | 2 +- + drivers/scsi/fnic/fnic_trace.c | 17 +- + drivers/scsi/g_NCR5380.c | 4 +- + drivers/scsi/gvp11.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 11 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 152 ++++- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 10 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 10 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 187 ++++- + drivers/scsi/hosts.c | 4 +- + drivers/scsi/hpsa.c | 9 +- + drivers/scsi/hptiop.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 30 - + drivers/scsi/imm.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/isci/init.c | 2 +- + drivers/scsi/iscsi_tcp.c | 4 +- + drivers/scsi/jazz_esp.c | 2 +- + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/libsas/sas_discover.c | 29 + + drivers/scsi/lpfc/lpfc.h | 2 - + drivers/scsi/lpfc/lpfc_attr.c | 102 +-- + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 2 + + drivers/scsi/lpfc/lpfc_ct.c | 8 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 9 +- + drivers/scsi/lpfc/lpfc_els.c | 50 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 39 +- + drivers/scsi/lpfc/lpfc_hw.h | 14 +- + drivers/scsi/lpfc/lpfc_init.c | 6 +- + drivers/scsi/lpfc/lpfc_nvme.c | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 83 +-- + drivers/scsi/lpfc/lpfc_sli4.h | 19 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mac53c94.c | 2 +- + drivers/scsi/mac_esp.c | 2 +- + drivers/scsi/megaraid.c | 3 +- + drivers/scsi/megaraid/megaraid_mbox.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mesh.c | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 112 ++- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 23 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 6 +- + drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 4 +- + drivers/scsi/mpi3mr/mpi3mr.h | 15 +- + drivers/scsi/mpi3mr/mpi3mr_app.c | 5 +- + drivers/scsi/mpi3mr/mpi3mr_debug.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 6 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 80 ++- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 5 - + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +- + drivers/scsi/mvme147.c | 2 +- + drivers/scsi/mvsas/mv_init.c | 2 +- + drivers/scsi/mvumi.c | 2 +- + drivers/scsi/myrb.c | 2 +- + drivers/scsi/myrs.c | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/ppa.c | 2 +- + drivers/scsi/ps3rom.c | 2 +- + drivers/scsi/qedf/qedf_main.c | 4 +- + drivers/scsi/qedi/qedi_gbl.h | 2 +- + drivers/scsi/qedi/qedi_iscsi.c | 2 +- + drivers/scsi/qla1280.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla2xxx/qla_gbl.h | 2 +- + drivers/scsi/qla2xxx/qla_mid.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 10 +- + drivers/scsi/qla2xxx/qla_target.c | 3 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 14 - + drivers/scsi/qla4xxx/ql4_def.h | 1 - + drivers/scsi/qla4xxx/ql4_isr.c | 2 - + drivers/scsi/qla4xxx/ql4_os.c | 4 - + drivers/scsi/qlogicpti.c | 13 +- + drivers/scsi/scsi_debug.c | 981 ++++++++++++--------------- + drivers/scsi/scsi_error.c | 16 +- + drivers/scsi/scsi_sysfs.c | 6 +- + drivers/scsi/scsi_transport_fc.c | 3 +- + drivers/scsi/sgiwd93.c | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 2 +- + drivers/scsi/snic/snic_main.c | 2 +- + drivers/scsi/snic/snic_scsi.c | 7 +- + drivers/scsi/sr.c | 7 +- + drivers/scsi/stex.c | 2 +- + drivers/scsi/sun3x_esp.c | 2 +- + drivers/scsi/sun_esp.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/scsi/wd719x.c | 2 +- + drivers/scsi/xen-scsifront.c | 2 +- + drivers/scsi/zorro_esp.c | 2 +- + drivers/staging/rts5208/rtsx.c | 2 +- + drivers/target/Kconfig | 1 + + drivers/target/Makefile | 1 + + drivers/target/iscsi/iscsi_target.c | 51 +- + drivers/target/iscsi/iscsi_target_login.c | 7 + + drivers/target/loopback/tcm_loop.c | 50 +- + drivers/target/sbp/sbp_target.c | 31 - + drivers/target/target_core_alua.c | 4 +- + drivers/target/target_core_configfs.c | 94 ++- + drivers/target/target_core_device.c | 44 +- + drivers/target/target_core_fabric_configfs.c | 44 +- + drivers/target/target_core_internal.h | 4 +- + drivers/target/target_core_pr.c | 8 +- + drivers/target/target_core_spc.c | 7 +- + drivers/target/target_core_stat.c | 6 +- + drivers/target/target_core_tmr.c | 26 +- + drivers/target/target_core_tpg.c | 73 +- + drivers/target/target_core_transport.c | 199 ++++-- + drivers/target/target_core_xcopy.c | 23 +- + drivers/target/tcm_fc/tcm_fc.h | 1 - + drivers/target/tcm_fc/tfc_cmd.c | 5 - + drivers/target/tcm_fc/tfc_conf.c | 15 - + drivers/target/tcm_remote/Kconfig | 8 + + drivers/target/tcm_remote/Makefile | 2 + + drivers/target/tcm_remote/tcm_remote.c | 268 ++++++++ + drivers/target/tcm_remote/tcm_remote.h | 20 + + drivers/ufs/core/ufshcd.c | 124 ++-- + drivers/ufs/host/ufs-exynos.c | 2 +- + drivers/ufs/host/ufs-hisi.c | 2 +- + drivers/ufs/host/ufs-qcom.c | 2 +- + drivers/ufs/host/ufshcd-pci.c | 1 + + drivers/usb/gadget/function/f_tcm.c | 35 +- + drivers/usb/image/microtek.c | 2 +- + drivers/usb/storage/uas.c | 2 +- + drivers/usb/storage/usb.c | 2 +- + drivers/usb/storage/usb.h | 2 +- + drivers/vhost/scsi.c | 31 - + drivers/xen/xen-scsiback.c | 30 - + include/linux/ahci_platform.h | 2 +- + include/linux/ata_platform.h | 2 +- + include/linux/libata.h | 10 +- + include/linux/raid_class.h | 2 +- + include/scsi/libfc.h | 2 +- + include/scsi/libiscsi.h | 2 +- + include/scsi/scsi_host.h | 4 +- + include/target/iscsi/iscsi_target_core.h | 1 + + include/target/target_core_base.h | 21 +- + include/target/target_core_fabric.h | 15 +- + include/trace/events/ufs.h | 22 +- + include/uapi/linux/target_core_user.h | 2 +- + include/ufs/ufshcd.h | 7 +- + 314 files changed, 2227 insertions(+), 1819 deletions(-) + create mode 100644 drivers/target/tcm_remote/Kconfig + create mode 100644 drivers/target/tcm_remote/Makefile + create mode 100644 drivers/target/tcm_remote/tcm_remote.c + create mode 100644 drivers/target/tcm_remote/tcm_remote.h +Merging scsi-mkp/for-next (3c85f087faeca scsi: ufs: mcq: Use pointer arithmetic in ufshcd_send_command()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging include/ufs/ufshcd.h +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Merge made by the 'recursive' strategy. + drivers/scsi/cxlflash/superpipe.c | 2 +- + drivers/scsi/cxlflash/vlun.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 4 ++++ + drivers/scsi/lpfc/lpfc_init.c | 11 +++++++---- + drivers/scsi/mpi3mr/mpi3mr_os.c | 6 +++--- + drivers/scsi/mpt3sas/mpt3sas_base.c | 10 ++-------- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 ++-- + drivers/scsi/scsi_debug.c | 4 +++- + drivers/target/target_core_fabric_configfs.c | 7 +++---- + drivers/ufs/core/ufshcd-priv.h | 1 + + drivers/ufs/core/ufshcd.c | 5 +++-- + include/ufs/ufshcd.h | 2 +- + 12 files changed, 31 insertions(+), 27 deletions(-) +Merging vhost/linux-next (72baf650a031c vdpa/snet: support the suspend vDPA callback) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/vdpa/vdpa_user/vduse_dev.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/vdpa/mlx5/net/mlx5_vnet.c | 261 +++++++++++++--------- + drivers/vdpa/solidrun/Makefile | 1 + + drivers/vdpa/solidrun/snet_ctrl.c | 324 +++++++++++++++++++++++++++ + drivers/vdpa/solidrun/snet_hwmon.c | 2 +- + drivers/vdpa/solidrun/snet_main.c | 126 +++++------ + drivers/vdpa/solidrun/snet_vdpa.h | 18 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 161 +++++++++++--- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 11 +- + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 10 +- + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 10 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 414 +++++++++++++++++++++++++++++------ + drivers/vhost/scsi.c | 102 +++++---- + drivers/vhost/vdpa.c | 36 +++ + drivers/vhost/vhost.c | 6 +- + drivers/vhost/vringh.c | 191 ++++++++++++---- + drivers/virtio/virtio_pci_modern.c | 5 - + drivers/virtio/virtio_ring.c | 70 +++--- + drivers/virtio/virtio_vdpa.c | 97 ++++++++ + include/linux/vdpa.h | 43 +++- + include/linux/virtio.h | 16 +- + include/linux/vringh.h | 26 ++- + lib/group_cpus.c | 1 + + tools/virtio/virtio_test.c | 12 +- + 24 files changed, 1514 insertions(+), 430 deletions(-) + create mode 100644 drivers/vdpa/solidrun/snet_ctrl.c +Merging rpmsg/for-next (933d2f67afb29 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging drivers/remoteproc/qcom_q6v5_pas.c +Auto-merging drivers/remoteproc/qcom_q6v5_mss.c +Merge made by the 'recursive' strategy. + .../bindings/remoteproc/st,stm32-rproc.yaml | 4 +- + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 76 +++-- + drivers/mailbox/zynqmp-ipi-mailbox.c | 13 +- + drivers/remoteproc/da8xx_remoteproc.c | 12 +- + drivers/remoteproc/imx_dsp_rproc.c | 249 ++++++++++++++-- + drivers/remoteproc/imx_rproc.c | 7 +- + drivers/remoteproc/mtk_scp.c | 12 +- + drivers/remoteproc/mtk_scp_ipi.c | 2 +- + drivers/remoteproc/pru_rproc.c | 5 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 10 +- + drivers/remoteproc/qcom_q6v5_mss.c | 8 +- + drivers/remoteproc/qcom_q6v5_pas.c | 14 +- + drivers/remoteproc/qcom_wcnss.c | 10 +- + drivers/remoteproc/rcar_rproc.c | 9 +- + drivers/remoteproc/st_remoteproc.c | 5 +- + drivers/remoteproc/stm32_rproc.c | 14 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 127 +++++--- + drivers/remoteproc/xlnx_r5_remoteproc.c | 324 ++++++++++++++++----- + drivers/rpmsg/qcom_glink_rpm.c | 6 +- + drivers/rpmsg/qcom_smd.c | 24 +- + include/linux/mailbox/zynqmp-ipi-message.h | 2 +- + include/linux/rpmsg/qcom_smd.h | 5 +- + 22 files changed, 707 insertions(+), 231 deletions(-) +Merging gpio/for-next (e73f0f0ee7541 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (8a4adcf67a39b gpio: gpiolib: Simplify gpiochip_add_data_with_key() fwnode) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Removing include/asm-generic/gpio.h +Auto-merging drivers/net/ieee802154/ca8210.c +Auto-merging drivers/gpio/gpiolib-sysfs.c +Auto-merging drivers/gpio/gpiolib-acpi.c +Auto-merging drivers/gpio/gpio-davinci.c +Auto-merging drivers/gpio/gpio-104-dio-48e.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Removing arch/sh/include/asm/gpio.h +Auto-merging arch/sh/Kconfig +Auto-merging arch/powerpc/platforms/8xx/cpm1.c +Removing arch/m68k/include/asm/gpio.h +Auto-merging arch/m68k/Kconfig.cpu +Removing arch/arm/include/asm/gpio.h +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/gpio/sysfs.rst | 2 +- + .../devicetree/bindings/gpio/fcs,fxl6408.yaml | 58 +++ + Documentation/devicetree/bindings/gpio/gpio.txt | 41 +- + .../devicetree/bindings/gpio/loongson,ls-gpio.yaml | 126 +++++ + .../bindings/gpio/loongson,ls1x-gpio.yaml | 49 ++ + Documentation/driver-api/gpio/driver.rst | 8 +- + Documentation/driver-api/gpio/legacy.rst | 23 - + .../translations/zh_CN/driver-api/gpio/legacy.rst | 20 - + Documentation/translations/zh_TW/gpio.txt | 19 - + MAINTAINERS | 11 +- + arch/arm/Kconfig | 1 - + arch/arm/include/asm/gpio.h | 21 - + arch/arm/mach-omap1/irq.c | 1 + + arch/arm/mach-omap2/pdata-quirks.c | 9 +- + arch/arm/mach-orion5x/board-rd88f5182.c | 1 + + arch/arm/mach-s3c/s3c64xx.c | 2 +- + arch/arm/mach-sa1100/assabet.c | 1 + + arch/arm/plat-orion/gpio.c | 5 +- + arch/m68k/Kconfig.cpu | 1 - + arch/m68k/include/asm/gpio.h | 95 ---- + arch/m68k/include/asm/mcfgpio.h | 2 +- + arch/mips/ar7/gpio.c | 2 +- + arch/powerpc/platforms/40x/Kconfig | 1 + + arch/powerpc/platforms/44x/Kconfig | 1 + + arch/powerpc/platforms/4xx/gpio.c | 2 +- + arch/powerpc/platforms/8xx/Kconfig | 1 + + arch/powerpc/platforms/8xx/cpm1.c | 2 +- + arch/powerpc/platforms/Kconfig | 2 + + arch/powerpc/sysdev/cpm_common.c | 2 +- + arch/sh/Kconfig | 1 - + arch/sh/boards/board-magicpanelr2.c | 1 + + arch/sh/boards/mach-ap325rxa/setup.c | 7 +- + arch/sh/boards/mach-x3proto/setup.c | 2 +- + arch/sh/include/asm/gpio.h | 45 -- + drivers/gpio/Kconfig | 81 +++- + drivers/gpio/Makefile | 4 + + drivers/gpio/TODO | 15 +- + drivers/gpio/gpio-104-dio-48e.c | 11 +- + drivers/gpio/gpio-adnp.c | 9 +- + drivers/gpio/gpio-aggregator.c | 9 +- + drivers/gpio/gpio-altera.c | 29 +- + drivers/gpio/gpio-aspeed-sgpio.c | 45 +- + drivers/gpio/gpio-aspeed.c | 82 ++-- + drivers/gpio/gpio-ath79.c | 8 +- + drivers/gpio/gpio-cadence.c | 10 +- + drivers/gpio/gpio-davinci.c | 2 - + drivers/gpio/gpio-elkhartlake.c | 90 ++++ + drivers/gpio/gpio-ftgpio010.c | 2 +- + drivers/gpio/gpio-fxl6408.c | 158 ++++++ + drivers/gpio/gpio-hisi.c | 25 +- + drivers/gpio/gpio-hlwd.c | 33 +- + drivers/gpio/gpio-ich.c | 10 +- + drivers/gpio/gpio-idt3243x.c | 11 +- + drivers/gpio/gpio-imx-scu.c | 1 - + drivers/gpio/gpio-loongson-64bit.c | 238 +++++++++ + drivers/gpio/gpio-loongson1.c | 71 +-- + drivers/gpio/gpio-max732x.c | 8 +- + drivers/gpio/gpio-merrifield.c | 453 ++--------------- + drivers/gpio/gpio-mlxbf2.c | 32 +- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-mpc5200.c | 2 +- + drivers/gpio/gpio-msc313.c | 26 +- + drivers/gpio/gpio-mxs.c | 1 - + drivers/gpio/gpio-omap.c | 83 ++-- + drivers/gpio/gpio-pci-idio-16.c | 12 +- + drivers/gpio/gpio-pcie-idio-24.c | 21 +- + drivers/gpio/gpio-pxa.c | 5 - + drivers/gpio/gpio-raspberrypi-exp.c | 2 +- + drivers/gpio/gpio-rcar.c | 2 +- + drivers/gpio/gpio-rda.c | 23 +- + drivers/gpio/gpio-reg.c | 12 +- + drivers/gpio/gpio-regmap.c | 12 +- + drivers/gpio/gpio-sama5d2-piobu.c | 2 +- + drivers/gpio/gpio-sifive.c | 2 +- + drivers/gpio/gpio-sim.c | 2 +- + drivers/gpio/gpio-siox.c | 75 +-- + drivers/gpio/gpio-stmpe.c | 8 +- + drivers/gpio/gpio-stp-xway.c | 2 +- + drivers/gpio/gpio-tangier.c | 536 +++++++++++++++++++++ + drivers/gpio/gpio-tangier.h | 117 +++++ + drivers/gpio/gpio-tb10x.c | 2 +- + drivers/gpio/gpio-thunderx.c | 26 +- + drivers/gpio/gpio-tqmx86.c | 28 +- + drivers/gpio/gpio-visconti.c | 52 +- + drivers/gpio/gpio-xgs-iproc.c | 32 +- + drivers/gpio/gpio-xilinx.c | 23 +- + drivers/gpio/gpio-xlp.c | 14 +- + drivers/gpio/gpio-xra1403.c | 2 +- + drivers/gpio/gpiolib-acpi.c | 36 +- + drivers/gpio/gpiolib-acpi.h | 1 - + drivers/gpio/gpiolib-of.c | 9 +- + drivers/gpio/gpiolib-of.h | 1 - + drivers/gpio/gpiolib-swnode.c | 5 +- + drivers/gpio/gpiolib-sysfs.c | 25 +- + drivers/gpio/gpiolib.c | 173 ++++--- + drivers/hte/hte-tegra194-test.c | 10 +- + drivers/input/touchscreen/ads7846.c | 5 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 10 +- + drivers/net/ieee802154/ca8210.c | 3 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/led.c | 1 + + drivers/pinctrl/core.c | 1 - + drivers/soc/fsl/qe/gpio.c | 2 +- + include/asm-generic/gpio.h | 147 ------ + include/linux/gpio.h | 104 ++-- + include/linux/gpio/consumer.h | 24 +- + include/linux/gpio/driver.h | 31 +- + include/linux/gpio/legacy-of-mm-gpiochip.h | 36 ++ + include/linux/mfd/ucb1x00.h | 1 + + include/linux/of_gpio.h | 21 - + 109 files changed, 2411 insertions(+), 1363 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/fcs,fxl6408.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/loongson,ls1x-gpio.yaml + delete mode 100644 arch/arm/include/asm/gpio.h + delete mode 100644 arch/m68k/include/asm/gpio.h + delete mode 100644 arch/sh/include/asm/gpio.h + create mode 100644 drivers/gpio/gpio-elkhartlake.c + create mode 100644 drivers/gpio/gpio-fxl6408.c + create mode 100644 drivers/gpio/gpio-loongson-64bit.c + create mode 100644 drivers/gpio/gpio-tangier.c + create mode 100644 drivers/gpio/gpio-tangier.h + delete mode 100644 include/asm-generic/gpio.h + create mode 100644 include/linux/gpio/legacy-of-mm-gpiochip.h +Merging gpio-intel/for-next (782eea0c89f7d gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xNU) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (d45e84fb83511 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging drivers/pinctrl/renesas/pinctrl-rzn1.c +Auto-merging drivers/pinctrl/renesas/pinctrl-rza1.c +Removing drivers/pinctrl/renesas/pfc-r8a77950.c +Removing drivers/pinctrl/ralink/pinctrl-mt7620.c +Removing drivers/pinctrl/ralink/Makefile +Removing drivers/pinctrl/ralink/Kconfig +Removing drivers/pinctrl/pinctrl-thunderbay.c +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml +Removing Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt +Auto-merging Documentation/devicetree/bindings/pinctrl/mediatek,mt8192-pinctrl.yaml +Removing Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/nxp,pcf8575.yaml | 4 + + .../bindings/pinctrl/actions,s500-pinctrl.yaml | 2 +- + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 +- + .../bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml | 67 + + .../pinctrl/amlogic,meson-pinctrl-common.yaml | 57 + + .../pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml | 68 + + .../amlogic,meson-pinctrl-g12a-periphs.yaml | 72 + + .../pinctrl/amlogic,meson8-pinctrl-aobus.yaml | 76 + + .../pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 78 + + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 2 +- + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 4 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 +- + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 6 +- + .../bindings/pinctrl/brcm,bcm6318-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm63268-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm6328-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm6358-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm6362-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,bcm6368-pinctrl.yaml | 2 +- + .../bindings/pinctrl/brcm,ns-pinmux.yaml | 2 +- + .../bindings/pinctrl/canaan,k210-fpioa.yaml | 2 +- + .../bindings/pinctrl/cirrus,lochnagar.yaml | 2 +- + .../devicetree/bindings/pinctrl/cirrus,madera.yaml | 4 +- + .../bindings/pinctrl/cypress,cy8c95x0.yaml | 2 +- + .../bindings/pinctrl/fsl,imx7d-pinctrl.yaml | 2 +- + .../bindings/pinctrl/fsl,imx8m-pinctrl.yaml | 2 +- + .../bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml | 2 +- + .../bindings/pinctrl/fsl,imx93-pinctrl.yaml | 2 +- + .../bindings/pinctrl/ingenic,pinctrl.yaml | 2 +- + .../devicetree/bindings/pinctrl/intel,lgm-io.yaml | 2 +- + .../bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 120 - + .../bindings/pinctrl/lantiq,pinctrl-xway.txt | 35 +- + .../bindings/pinctrl/marvell,ac5-pinctrl.yaml | 4 +- + .../bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 32 +- + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 39 +- + ...rl-mt6795.yaml => mediatek,mt6795-pinctrl.yaml} | 51 +- + .../bindings/pinctrl/mediatek,mt7620-pinctrl.yaml | 298 + + ...1-pinctrl.yaml => mediatek,mt7621-pinctrl.yaml} | 17 +- + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 34 +- + ...0-pinctrl.yaml => mediatek,mt76x8-pinctrl.yaml} | 252 +- + .../bindings/pinctrl/mediatek,mt7981-pinctrl.yaml | 35 +- + .../bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 80 +- + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 40 +- + ...rl-mt8186.yaml => mediatek,mt8186-pinctrl.yaml} | 55 +- + .../bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 80 +- + ...rl-mt8192.yaml => mediatek,mt8192-pinctrl.yaml} | 57 +- + ...rl-mt8195.yaml => mediatek,mt8195-pinctrl.yaml} | 51 +- + .../bindings/pinctrl/mediatek,mt8365-pinctrl.yaml | 69 +- + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 94 - + .../bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 6 +- + .../bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml | 123 + + .../bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 130 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 6 +- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 4 +- + .../bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 1 + + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 1 + + .../bindings/pinctrl/qcom,sm7150-tlmm.yaml | 162 + + .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 2 +- + .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 2 +- + .../bindings/pinctrl/qcom,tlmm-common.yaml | 2 +- + .../bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 11 +- + .../bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 89 +- + .../bindings/pinctrl/ralink,rt3352-pinctrl.yaml | 243 + + .../bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 11 +- + .../bindings/pinctrl/ralink,rt5350-pinctrl.yaml | 206 + + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 2 +- + .../bindings/pinctrl/renesas,rza1-ports.yaml | 2 +- + .../bindings/pinctrl/renesas,rza2-pinctrl.yaml | 2 +- + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 +- + .../bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 2 +- + .../bindings/pinctrl/renesas,rzv2m-pinctrl.yaml | 2 +- + .../bindings/pinctrl/rockchip,pinctrl.yaml | 10 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 2 +- + .../bindings/pinctrl/semtech,sx1501q.yaml | 6 +- + .../pinctrl/socionext,uniphier-pinctrl.yaml | 2 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 10 +- + .../bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 6 +- + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 6 +- + .../bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 8 +- + .../bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 2 +- + MAINTAINERS | 42 +- + drivers/pinctrl/Kconfig | 34 +- + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/freescale/Kconfig | 2 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 80 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 24 - + drivers/pinctrl/mediatek/Kconfig | 54 +- + drivers/pinctrl/mediatek/Makefile | 63 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt7620.c | 137 + + .../pinctrl/{ralink => mediatek}/pinctrl-mt7621.c | 31 +- + drivers/pinctrl/mediatek/pinctrl-mt76x8.c | 283 + + .../pinctrl-ralink.c => mediatek/pinctrl-mtmips.c} | 90 +- + .../pinctrl-ralink.h => mediatek/pinctrl-mtmips.h} | 16 +- + .../pinctrl/{ralink => mediatek}/pinctrl-rt2880.c | 21 +- + .../pinctrl/{ralink => mediatek}/pinctrl-rt305x.c | 47 +- + .../pinctrl/{ralink => mediatek}/pinctrl-rt3883.c | 29 +- + drivers/pinctrl/nxp/Kconfig | 15 + + drivers/pinctrl/nxp/Makefile | 4 + + drivers/pinctrl/nxp/pinctrl-s32.h | 57 + + drivers/pinctrl/nxp/pinctrl-s32cc.c | 973 ++++ + drivers/pinctrl/nxp/pinctrl-s32g2.c | 770 +++ + drivers/pinctrl/pinctrl-amd.c | 90 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 43 +- + drivers/pinctrl/pinctrl-at91.c | 189 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 45 +- + drivers/pinctrl/pinctrl-mlxbf3.c | 320 ++ + drivers/pinctrl/pinctrl-single.c | 4 +- + drivers/pinctrl/pinctrl-stmfx.c | 2 +- + drivers/pinctrl/pinctrl-sx150x.c | 2 +- + drivers/pinctrl/pinctrl-thunderbay.c | 1294 ----- + drivers/pinctrl/pinctrl-xway.c | 252 - + drivers/pinctrl/qcom/Kconfig | 21 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-ipq9574.c | 826 +++ + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 46 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 5 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 14 + + drivers/pinctrl/qcom/pinctrl-sm7150.c | 1280 +++++ + drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c | 8 + + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/ralink/Kconfig | 35 - + drivers/pinctrl/ralink/Makefile | 8 - + drivers/pinctrl/ralink/pinctrl-mt7620.c | 391 -- + drivers/pinctrl/renesas/Kconfig | 5 - + drivers/pinctrl/renesas/Makefile | 1 - + drivers/pinctrl/renesas/core.c | 51 +- + drivers/pinctrl/renesas/pfc-emev2.c | 2 +- + drivers/pinctrl/renesas/pfc-r8a73a4.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a7740.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a77470.c | 46 +- + drivers/pinctrl/renesas/pfc-r8a7778.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a7779.c | 446 +- + drivers/pinctrl/renesas/pfc-r8a7790.c | 4 +- + drivers/pinctrl/renesas/pfc-r8a7791.c | 6 +- + drivers/pinctrl/renesas/pfc-r8a7792.c | 2 +- + drivers/pinctrl/renesas/pfc-r8a7794.c | 50 +- + drivers/pinctrl/renesas/pfc-r8a77950.c | 5947 -------------------- + drivers/pinctrl/renesas/pfc-r8a77951.c | 12 +- + drivers/pinctrl/renesas/pfc-r8a7796.c | 12 +- + drivers/pinctrl/renesas/pfc-r8a77965.c | 12 +- + drivers/pinctrl/renesas/pfc-r8a77970.c | 38 +- + drivers/pinctrl/renesas/pfc-r8a77980.c | 49 +- + drivers/pinctrl/renesas/pfc-r8a77990.c | 41 +- + drivers/pinctrl/renesas/pfc-r8a77995.c | 46 +- + drivers/pinctrl/renesas/pfc-r8a779a0.c | 16 +- + drivers/pinctrl/renesas/pfc-r8a779f0.c | 10 +- + drivers/pinctrl/renesas/pfc-r8a779g0.c | 1095 ++-- + drivers/pinctrl/renesas/pfc-sh7203.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7264.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7269.c | 6 +- + drivers/pinctrl/renesas/pfc-sh73a0.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7720.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7722.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7723.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7724.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7734.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7757.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7785.c | 4 +- + drivers/pinctrl/renesas/pfc-sh7786.c | 4 +- + drivers/pinctrl/renesas/pfc-shx3.c | 4 +- + drivers/pinctrl/renesas/pinctrl-rza1.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rzn1.c | 2 +- + drivers/pinctrl/renesas/pinctrl.c | 53 +- + drivers/pinctrl/renesas/sh_pfc.h | 14 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 20 +- + 170 files changed, 8555 insertions(+), 10141 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-common.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl-g12a-periphs.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-aobus.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson8-pinctrl-cbus.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/intel,pinctrl-thunderbay.yaml + rename Documentation/devicetree/bindings/pinctrl/{mediatek,pinctrl-mt6795.yaml => mediatek,mt6795-pinctrl.yaml} (85%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt7620-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{ralink,mt7621-pinctrl.yaml => mediatek,mt7621-pinctrl.yaml} (96%) + rename Documentation/devicetree/bindings/pinctrl/{ralink,mt7620-pinctrl.yaml => mediatek,mt76x8-pinctrl.yaml} (61%) + rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8186.yaml => mediatek,mt8186-pinctrl.yaml} (87%) + rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8192.yaml => mediatek,mt8192-pinctrl.yaml} (81%) + rename Documentation/devicetree/bindings/pinctrl/{pinctrl-mt8195.yaml => mediatek,mt8195-pinctrl.yaml} (89%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq9574-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm7150-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt3352-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ralink,rt5350-pinctrl.yaml + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7620.c + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-mt7621.c (79%) + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt76x8.c + rename drivers/pinctrl/{ralink/pinctrl-ralink.c => mediatek/pinctrl-mtmips.c} (74%) + rename drivers/pinctrl/{ralink/pinctrl-ralink.h => mediatek/pinctrl-mtmips.h} (75%) + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt2880.c (69%) + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt305x.c (73%) + rename drivers/pinctrl/{ralink => mediatek}/pinctrl-rt3883.c (79%) + create mode 100644 drivers/pinctrl/nxp/Kconfig + create mode 100644 drivers/pinctrl/nxp/Makefile + create mode 100644 drivers/pinctrl/nxp/pinctrl-s32.h + create mode 100644 drivers/pinctrl/nxp/pinctrl-s32cc.c + create mode 100644 drivers/pinctrl/nxp/pinctrl-s32g2.c + create mode 100644 drivers/pinctrl/pinctrl-mlxbf3.c + delete mode 100644 drivers/pinctrl/pinctrl-thunderbay.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq9574.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm7150.c + delete mode 100644 drivers/pinctrl/ralink/Kconfig + delete mode 100644 drivers/pinctrl/ralink/Makefile + delete mode 100644 drivers/pinctrl/ralink/pinctrl-mt7620.c + delete mode 100644 drivers/pinctrl/renesas/pfc-r8a77950.c +Merging pinctrl-intel/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (45e6cc8ef1cd8 pinctrl: renesas: core: Drop unneeded #ifdef CONFIG_OF) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (247ee6c780406 pwm: Remove unused radix tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/pwm/pwm-meson.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/apple,s5l-fpwm.yaml | 51 +++++++ + .../bindings/pwm/mediatek,mt2712-pwm.yaml | 1 + + .../devicetree/bindings/pwm/pwm-amlogic.yaml | 70 +++++++++ + .../devicetree/bindings/pwm/pwm-meson.txt | 29 ---- + Documentation/driver-api/pwm.rst | 13 +- + MAINTAINERS | 2 + + drivers/pwm/Kconfig | 12 ++ + drivers/pwm/Makefile | 1 + + drivers/pwm/core.c | 71 +-------- + drivers/pwm/pwm-apple.c | 159 +++++++++++++++++++++ + drivers/pwm/pwm-atmel-hlcdc.c | 6 +- + drivers/pwm/pwm-atmel-tcb.c | 6 +- + drivers/pwm/pwm-atmel.c | 6 +- + drivers/pwm/pwm-bcm-iproc.c | 6 +- + drivers/pwm/pwm-bcm2835.c | 6 +- + drivers/pwm/pwm-berlin.c | 6 +- + drivers/pwm/pwm-brcmstb.c | 6 +- + drivers/pwm/pwm-clk.c | 6 +- + drivers/pwm/pwm-cros-ec.c | 6 +- + drivers/pwm/pwm-hibvt.c | 6 +- + drivers/pwm/pwm-img.c | 6 +- + drivers/pwm/pwm-imx-tpm.c | 6 +- + drivers/pwm/pwm-lpc18xx-sct.c | 6 +- + drivers/pwm/pwm-lpss-platform.c | 5 +- + drivers/pwm/pwm-meson.c | 6 +- + drivers/pwm/pwm-mtk-disp.c | 40 ++++-- + drivers/pwm/pwm-omap-dmtimer.c | 6 +- + drivers/pwm/pwm-rcar.c | 8 +- + drivers/pwm/pwm-rockchip.c | 6 +- + drivers/pwm/pwm-samsung.c | 6 +- + drivers/pwm/pwm-sifive.c | 6 +- + drivers/pwm/pwm-spear.c | 6 +- + drivers/pwm/pwm-sprd.c | 6 +- + drivers/pwm/pwm-sti.c | 6 +- + drivers/pwm/pwm-stm32-lp.c | 2 +- + drivers/pwm/pwm-stm32.c | 10 +- + drivers/pwm/pwm-sun4i.c | 6 +- + drivers/pwm/pwm-tegra.c | 6 +- + drivers/pwm/pwm-tiecap.c | 6 +- + drivers/pwm/pwm-tiehrpwm.c | 6 +- + drivers/pwm/pwm-vt8500.c | 6 +- + drivers/pwm/pwm-xilinx.c | 5 +- + include/linux/mfd/stm32-timers.h | 1 + + include/linux/pwm.h | 13 -- + 44 files changed, 397 insertions(+), 252 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt + create mode 100644 drivers/pwm/pwm-apple.c +Merging userns/for-next (05bd6e0242b4c Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3352 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (7dc8e24f0e098 ktest: Restore stty setting at first in dodie) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (91db4fd9019a0 selftests/resctrl: Remove duplicate codes that clear each test result file) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'recursive' strategy. + tools/include/nolibc/stdio.h | 6 ++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/amd-pstate/gitsource.sh | 4 +- + tools/testing/selftests/amd-pstate/run.sh | 4 +- + tools/testing/selftests/arm64/fp/Makefile | 2 +- + tools/testing/selftests/arm64/fp/za-fork.c | 88 ++++------------- + tools/testing/selftests/kselftest.h | 2 + + tools/testing/selftests/prctl/.gitignore | 1 + + tools/testing/selftests/prctl/Makefile | 2 +- + tools/testing/selftests/prctl/config | 1 + + .../selftests/prctl/set-anon-vma-name-test.c | 104 +++++++++++++++++++++ + tools/testing/selftests/ptrace/peeksiginfo.c | 14 +-- + tools/testing/selftests/resctrl/cache.c | 17 ++-- + tools/testing/selftests/resctrl/cat_test.c | 33 ++++--- + tools/testing/selftests/resctrl/cmt_test.c | 16 ++-- + tools/testing/selftests/resctrl/fill_buf.c | 21 +---- + tools/testing/selftests/resctrl/mba_test.c | 34 ++++--- + tools/testing/selftests/resctrl/mbm_test.c | 22 ++--- + tools/testing/selftests/resctrl/resctrl.h | 8 +- + tools/testing/selftests/resctrl/resctrl_tests.c | 14 +-- + tools/testing/selftests/resctrl/resctrl_val.c | 88 +++++++++++------ + tools/testing/selftests/resctrl/resctrlfs.c | 7 +- + tools/testing/selftests/sched/cs_prctl_test.c | 6 ++ + 23 files changed, 291 insertions(+), 204 deletions(-) + create mode 100644 tools/testing/selftests/prctl/config + create mode 100644 tools/testing/selftests/prctl/set-anon-vma-name-test.c +Merging kunit/test (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (a42077b787680 kunit: add tests for using current KUnit test field) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging .gitignore +Merge made by the 'recursive' strategy. + .gitignore | 1 + + include/kunit/resource.h | 2 +- + include/kunit/test.h | 4 +- + lib/kunit/debugfs.c | 14 +- + lib/kunit/kunit-test.c | 77 ++++++-- + lib/kunit/test.c | 57 ++++-- + lib/list-test.c | 300 ++++++++++++++++++++++++++++++- + tools/testing/kunit/kunit.py | 26 +-- + tools/testing/kunit/kunit_config.py | 4 +- + tools/testing/kunit/kunit_kernel.py | 39 ++-- + tools/testing/kunit/kunit_parser.py | 1 - + tools/testing/kunit/kunit_printer.py | 2 +- + tools/testing/kunit/kunit_tool_test.py | 2 +- + tools/testing/kunit/qemu_config.py | 1 + + tools/testing/kunit/qemu_configs/m68k.py | 10 ++ + tools/testing/kunit/qemu_configs/sh.py | 17 ++ + tools/testing/kunit/run_checks.py | 6 +- + 17 files changed, 491 insertions(+), 72 deletions(-) + create mode 100644 tools/testing/kunit/qemu_configs/m68k.py + create mode 100644 tools/testing/kunit/qemu_configs/sh.py +Merging livepatching/for-next (5e36be5973b6a Merge branch 'for-6.4/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Auto-merging kernel/livepatch/core.c +Auto-merging include/linux/module.h +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1309 and retry the command. +Merge made by the 'recursive' strategy. + Documentation/livepatch/module-elf-format.rst | 20 ++++++++++---------- + include/linux/module.h | 6 +++--- + kernel/livepatch/core.c | 6 +++--- + kernel/module/livepatch.c | 10 +++++----- + 4 files changed, 21 insertions(+), 21 deletions(-) +Merging rtc/rtc-next (0e6255fa3f649 rtc: meson-vrtc: Use ktime_get_real_ts64() to get the current time) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'recursive' strategy. + .../bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +- + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +- + .../devicetree/bindings/rtc/brcm,brcmstb-waketimer.yaml | 2 +- + .../devicetree/bindings/rtc/faraday,ftrtc010.yaml | 4 ++-- + .../devicetree/bindings/rtc/microcrystal,rv3032.yaml | 2 +- + .../devicetree/bindings/rtc/mstar,msc313-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/nuvoton,nct3018y.yaml | 2 +- + Documentation/devicetree/bindings/rtc/nxp,pcf2127.yaml | 2 +- + Documentation/devicetree/bindings/rtc/rtc-mxc.yaml | 2 +- + Documentation/devicetree/bindings/rtc/rtc-mxc_v2.yaml | 2 +- + Documentation/devicetree/bindings/rtc/sa1100-rtc.yaml | 4 ++-- + Documentation/devicetree/bindings/rtc/st,stm32-rtc.yaml | 2 +- + Documentation/devicetree/bindings/rtc/ti,k3-rtc.yaml | 2 +- + Documentation/devicetree/bindings/rtc/trivial-rtc.yaml | 2 +- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-88pm80x.c | 5 ++--- + drivers/rtc/rtc-88pm860x.c | 6 ++---- + drivers/rtc/rtc-ab8500.c | 6 ++---- + drivers/rtc/rtc-ac100.c | 6 ++---- + drivers/rtc/rtc-asm9260.c | 5 ++--- + drivers/rtc/rtc-at91sam9.c | 6 ++---- + drivers/rtc/rtc-brcmstb-waketimer.c | 6 ++---- + drivers/rtc/rtc-cadence.c | 6 ++---- + drivers/rtc/rtc-cmos.c | 5 ++--- + drivers/rtc/rtc-cros-ec.c | 6 ++---- + drivers/rtc/rtc-ds1390.c | 2 +- + drivers/rtc/rtc-ds1685.c | 6 ++---- + drivers/rtc/rtc-ftrtc010.c | 6 ++---- + drivers/rtc/rtc-hid-sensor-time.c | 6 ++---- + drivers/rtc/rtc-lpc24xx.c | 6 ++---- + drivers/rtc/rtc-max77686.c | 6 ++---- + drivers/rtc/rtc-mc13xxx.c | 6 ++---- + drivers/rtc/rtc-meson-vrtc.c | 4 ++-- + drivers/rtc/rtc-mpc5121.c | 6 ++---- + drivers/rtc/rtc-mpfs.c | 6 ++---- + drivers/rtc/rtc-mt7622.c | 6 ++---- + drivers/rtc/rtc-mxc_v2.c | 5 ++--- + drivers/rtc/rtc-omap.c | 7 +++---- + drivers/rtc/rtc-palmas.c | 5 ++--- + drivers/rtc/rtc-pcf50633.c | 6 ++---- + drivers/rtc/rtc-pcf8523.c | 17 ++++++++--------- + drivers/rtc/rtc-pic32.c | 6 ++---- + drivers/rtc/rtc-pm8xxx.c | 5 ++--- + drivers/rtc/rtc-rc5t583.c | 5 ++--- + drivers/rtc/rtc-rtd119x.c | 6 ++---- + drivers/rtc/rtc-rzn1.c | 6 ++---- + drivers/rtc/rtc-s3c.c | 6 ++---- + drivers/rtc/rtc-sa1100.c | 6 ++---- + drivers/rtc/rtc-spear.c | 6 ++---- + drivers/rtc/rtc-stm32.c | 6 ++---- + drivers/rtc/rtc-stmp3xxx.c | 8 +++----- + drivers/rtc/rtc-sun6i.c | 2 +- + drivers/rtc/rtc-sunplus.c | 6 ++---- + drivers/rtc/rtc-tegra.c | 6 ++---- + drivers/rtc/rtc-tps6586x.c | 5 ++--- + drivers/rtc/rtc-twl.c | 6 ++---- + drivers/rtc/rtc-vt8500.c | 6 ++---- + drivers/rtc/rtc-wm8350.c | 6 ++---- + drivers/rtc/rtc-xgene.c | 5 ++--- + drivers/rtc/rtc-zynqmp.c | 6 ++---- + 62 files changed, 115 insertions(+), 188 deletions(-) +Merging nvdimm/libnvdimm-for-next (305a72efa791c Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (942cc9ceccb61 ntb: intel: Remove redundant pci_clear_master) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 9 ++++++--- + drivers/ntb/hw/epf/ntb_hw_epf.c | 12 ++++-------- + drivers/ntb/hw/idt/ntb_hw_idt.c | 24 +++++++++++------------- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 9 ++++++--- + drivers/ntb/ntb_transport.c | 2 +- + drivers/ntb/test/ntb_tool.c | 2 ++ + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 8 files changed, 32 insertions(+), 29 deletions(-) +Merging seccomp/for-next/seccomp (0fb0624b15d21 seccomp: fix kernel-doc function name warning) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (35af9fb49bc5c fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (c60363be9b769 nvmem: layouts: onie-tlv: Drop wrong module alias) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging include/linux/of_device.h +Auto-merging include/linux/of.h +CONFLICT (content): Merge conflict in include/linux/of.h +Auto-merging drivers/usb/common/ulpi.c +Auto-merging drivers/spi/spi.c +Auto-merging drivers/of/base.c +Auto-merging drivers/of/Makefile +CONFLICT (content): Merge conflict in drivers/of/Makefile +CONFLICT (add/add): Merge conflict in drivers/nvmem/layouts/sl28vpd.c +Auto-merging drivers/nvmem/layouts/sl28vpd.c +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/i2c/i2c-core-of.c +Auto-merging drivers/gpu/drm/drm_mipi_dsi.c +Auto-merging drivers/acpi/bus.c +Auto-merging MAINTAINERS +Resolved 'drivers/nvmem/layouts/sl28vpd.c' using previous resolution. +Resolved 'drivers/of/Makefile' using previous resolution. +Recorded preimage for 'include/linux/of.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/of.h'. +[master 1bae4d3fde115] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git +$ git diff -M --stat --summary HEAD^.. + +Merging xarray/main (69cb69ea55420 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 5748 and retry the command. +Merge made by the 'recursive' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (e6278af685a46 x86/hyperv: Exclude lazy TLB mode CPUs from enlightened TLB flushes) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging kernel/dma/swiotlb.c +Auto-merging include/linux/acpi.h +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/hv/connection.c +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/bus/microsoft,vmbus.yaml | 54 +++++ + MAINTAINERS | 1 + + arch/x86/hyperv/hv_apic.c | 12 +- + arch/x86/hyperv/hv_init.c | 7 +- + arch/x86/hyperv/ivm.c | 28 --- + arch/x86/hyperv/mmu.c | 11 +- + arch/x86/include/asm/hyperv-tlfs.h | 3 + + arch/x86/kernel/cpu/mshyperv.c | 7 +- + drivers/clocksource/hyperv_timer.c | 21 +- + drivers/hv/Kconfig | 6 +- + drivers/hv/channel_mgmt.c | 2 +- + drivers/hv/connection.c | 113 +++------- + drivers/hv/hv.c | 43 ++-- + drivers/hv/hv_common.c | 11 - + drivers/hv/hyperv_vmbus.h | 6 - + drivers/hv/ring_buffer.c | 62 ++---- + drivers/hv/vmbus_drv.c | 122 ++++++++--- + drivers/net/hyperv/hyperv_net.h | 2 - + drivers/net/hyperv/netvsc.c | 48 +---- + drivers/pci/controller/pci-hyperv.c | 232 +++++++++++++++------ + include/asm-generic/hyperv-tlfs.h | 22 ++ + include/asm-generic/mshyperv.h | 24 ++- + include/linux/acpi.h | 5 + + include/linux/swiotlb.h | 2 - + kernel/dma/swiotlb.c | 45 +--- + 25 files changed, 476 insertions(+), 413 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml +Merging auxdisplay/auxdisplay (ddf75a86aba2c auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (c1cb81429df46 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (3123109284176 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (1d1493bdc25f4 bus: mhi: host: Use mhi_tryset_pm_state() for setting fw error state) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'recursive' strategy. + drivers/bus/mhi/ep/main.c | 4 ++-- + drivers/bus/mhi/host/boot.c | 16 ++++++++++++---- + drivers/bus/mhi/host/init.c | 16 ++++++++++++++-- + drivers/bus/mhi/host/main.c | 25 +++++++------------------ + drivers/bus/mhi/host/pci_generic.c | 28 +++++++++++++++++++--------- + include/linux/mhi.h | 7 ------- + 6 files changed, 54 insertions(+), 42 deletions(-) +Merging memblock/for-next (34875d6fc52d6 Add tests for memblock_alloc_node()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Merge made by the 'recursive' strategy. + tools/testing/memblock/tests/alloc_nid_api.c | 40 ++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) +Merging cxl/next (e686c32590f40 dax/kmem: Fix leak of memory-hotplug resources) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (2aa14b1ab2c41 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (8364f6d000ede efi/loongarch: Reintroduce efi_relocate_kernel() to relocate kernel) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Merge made by the 'recursive' strategy. + drivers/firmware/efi/libstub/loongarch-stub.c | 24 +++++++----------------- + 1 file changed, 7 insertions(+), 17 deletions(-) +Merging unicode/for-next (b500d6d7243d2 unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 7391 and retry the command. +Merge made by the 'recursive' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (ed4cdfbeb8735 Merge branch 'slab/for-6.4/slob-removal' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging mm/slub.c +CONFLICT (modify/delete): mm/slob.c deleted in slab/for-next and modified in HEAD. Version HEAD of mm/slob.c left in tree. +Auto-merging mm/slab.h +Auto-merging mm/Makefile +Auto-merging mm/Kconfig.debug +Auto-merging mm/Kconfig +Auto-merging init/Kconfig +Auto-merging include/linux/slab.h +CONFLICT (content): Merge conflict in include/linux/slab.h +Auto-merging include/linux/page-flags.h +Resolved 'include/linux/slab.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f mm/slob.c +rm 'mm/slob.c' +$ git commit --no-edit -v -a +[master 393dacb0f09e7] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/mm/pagemap.rst | 6 +- + Documentation/core-api/memory-allocation.rst | 17 +- + fs/proc/page.c | 9 +- + include/linux/page-flags.h | 4 - + include/linux/rcupdate.h | 6 +- + include/linux/slab.h | 41 +- + init/Kconfig | 2 +- + kernel/configs/tiny.config | 1 - + mm/Kconfig | 22 - + mm/Kconfig.debug | 6 +- + mm/Makefile | 2 - + mm/slab.h | 61 --- + mm/slab_common.c | 7 +- + mm/slob.c | 755 --------------------------- + mm/slub.c | 2 +- + tools/mm/page-types.c | 6 +- + 16 files changed, 32 insertions(+), 915 deletions(-) + delete mode 100644 mm/slob.c +Merging random/master (512dee0c00ad9 Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (ed35e2f2f0ded landlock: Clarify documentation for the LANDLOCK_ACCESS_FS_REFER right) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2186 and retry the command. +Merge made by the 'recursive' strategy. + include/uapi/linux/landlock.h | 46 +++++++++++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 15 deletions(-) +Merging rust/rust-next (1944caa8e8dcb rust: sync: add functions for initializing `UniqueArc<MaybeUninit<T>>`) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Merge made by the 'recursive' strategy. + rust/alloc/vec/mod.rs | 137 +++- + rust/alloc/vec/set_len_on_drop.rs | 30 + + rust/alloc/vec/spec_extend.rs | 174 +++++ + rust/helpers.c | 19 + + rust/kernel/error.rs | 137 +++- + rust/kernel/init.rs | 1427 ++++++++++++++++++++++++++++++++++++ + rust/kernel/init/__internal.rs | 235 ++++++ + rust/kernel/init/macros.rs | 971 ++++++++++++++++++++++++ + rust/kernel/lib.rs | 7 + + rust/kernel/prelude.rs | 6 +- + rust/kernel/sync/arc.rs | 108 ++- + rust/kernel/sync/arc/std_vendor.rs | 28 + + rust/kernel/types.rs | 28 + + rust/macros/helpers.rs | 10 +- + rust/macros/lib.rs | 80 ++ + rust/macros/module.rs | 32 +- + rust/macros/pin_data.rs | 79 ++ + rust/macros/pinned_drop.rs | 49 ++ + rust/macros/quote.rs | 143 ++++ + samples/rust/rust_print.rs | 26 + + scripts/Makefile.build | 2 +- + 21 files changed, 3709 insertions(+), 19 deletions(-) + create mode 100644 rust/alloc/vec/set_len_on_drop.rs + create mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/kernel/init.rs + create mode 100644 rust/kernel/init/__internal.rs + create mode 100644 rust/kernel/init/macros.rs + create mode 100644 rust/kernel/sync/arc/std_vendor.rs + create mode 100644 rust/macros/pin_data.rs + create mode 100644 rust/macros/pinned_drop.rs + create mode 100644 rust/macros/quote.rs +$ git am -3 ../patches/0001-rust-fix-up-for-kbuild-move-core-y-and-drivers-y-to-.patch +Applying: rust: fix up for "kbuild: move core-y and drivers-y to ./Kbuild" +Using index info to reconstruct a base tree... +M Kbuild +Falling back to patching base and 3-way merge... +Auto-merging Kbuild +$ git reset HEAD^ +Unstaged changes after reset: +M Kbuild +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master e83e677fa0b95] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Fri Apr 14 17:13:35 2023 +0100 +Merging sysctl/sysctl-next (e3184de9d46c2 fs: fix sysctls.c built) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging security/yama/yama_lsm.c +Auto-merging security/loadpin/loadpin.c +Auto-merging security/apparmor/lsm.c +Auto-merging mm/memory-failure.c +Auto-merging mm/hugetlb.c +Auto-merging mm/compaction.c +Auto-merging include/linux/userfaultfd_k.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/hugetlb.h +Auto-merging fs/userfaultfd.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging drivers/md/md.c +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + arch/arm/kernel/isa.c | 18 +------ + arch/csky/abiv1/alignment.c | 15 +----- + arch/ia64/kernel/crash.c | 11 +--- + drivers/hv/vmbus_drv.c | 11 +--- + drivers/md/md.c | 22 +------- + drivers/scsi/scsi_sysctl.c | 16 +----- + drivers/xen/balloon.c | 20 +------ + fs/Makefile | 3 +- + fs/cachefiles/error_inject.c | 11 +--- + fs/coda/sysctl.c | 11 +--- + fs/lockd/svc.c | 20 +------ + fs/nfs/nfs4sysctl.c | 21 +------- + fs/nfs/sysctl.c | 20 +------ + fs/ntfs/sysctl.c | 12 +---- + fs/proc/proc_sysctl.c | 88 +++++++++++++++++++----------- + fs/userfaultfd.c | 20 ++++++- + fs/xfs/xfs_sysctl.c | 20 +------ + include/linux/compaction.h | 7 --- + include/linux/hugetlb.h | 8 --- + include/linux/mm.h | 2 - + include/linux/userfaultfd_k.h | 2 - + kernel/seccomp.c | 15 +----- + kernel/sysctl.c | 122 ------------------------------------------ + kernel/utsname_sysctl.c | 11 +--- + mm/compaction.c | 80 ++++++++++++++++++++++----- + mm/hugetlb.c | 51 ++++++++++++++++-- + mm/memory-failure.c | 36 ++++++++++++- + security/apparmor/lsm.c | 8 +-- + security/loadpin/loadpin.c | 8 +-- + security/yama/yama_lsm.c | 8 +-- + 30 files changed, 248 insertions(+), 449 deletions(-) +Merging execve/for-next/execve (88603b6dc4194 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (714f3af11b21b cpumask: fix function description kernel-doc notation) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/find.h +Auto-merging include/linux/cpumask.h +CONFLICT (content): Merge conflict in include/linux/cpumask.h +Resolved 'include/linux/cpumask.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3a8f3a1d818eb] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/bitmap.h | 54 +++++++++--------- + include/linux/cpumask.h | 140 +++++++++++++++++++++++------------------------ + include/linux/find.h | 40 +++++++------- + include/linux/nodemask.h | 88 ++++++++++++++--------------- + lib/bitmap.c | 2 +- + lib/cpumask.c | 2 +- + lib/test_bitmap.c | 18 +++++- + 7 files changed, 177 insertions(+), 167 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-mm-kasan-Skip-unpoisoning-of-user-pages.patch +Applying: fix up for "mm: kasan: Skip unpoisoning of user pages" +Using index info to reconstruct a base tree... +M include/linux/gfp_types.h +Falling back to patching base and 3-way merge... +Auto-merging include/linux/gfp_types.h +CONFLICT (content): Merge conflict in include/linux/gfp_types.h +Recorded preimage for 'include/linux/gfp_types.h' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +Patch failed at 0001 fix up for "mm: kasan: Skip unpoisoning of user pages" +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging hte/for-next (fe15c26ee26ef Linux 6.3-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (78f7a3fd6dc66 randstruct: disable Clang 15 support) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-dm-Add-verity-helpers-for-LoadPin.patch +Applying: fix up for "dm: Add verity helpers for LoadPin" +Using index info to reconstruct a base tree... +M drivers/md/dm-verity-loadpin.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/md/dm-verity-loadpin.c +No changes -- Patch already applied. +Merging kspp-gustavo/for-next/kspp (26476022a5b2a s390/fcx: Replace zero-length array with flexible-array member) + 26476022a5b2a ("s390/fcx: Replace zero-length array with flexible-array member") + 68b5d20a5ae2b ("s390/diag: Replace zero-length array with flexible-array member") +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_so.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 2 +- + include/uapi/linux/ipv6.h | 2 +- + include/uapi/sound/asoc.h | 6 +++--- + net/rxrpc/protocol.h | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) +Merging iommufd/for-next (1fb3556b418f4 Merge branch 'ko-iommufd/wip/for-nesting' into k.o-iommufd/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging samples/vfio-mdev/mtty.c +Auto-merging samples/vfio-mdev/mdpy.c +Auto-merging samples/vfio-mdev/mbochs.c +Auto-merging include/linux/vfio.h +Auto-merging drivers/vfio/vfio_main.c +Auto-merging drivers/iommu/iommu.c +Merge made by the 'recursive' strategy. + drivers/iommu/iommu-priv.h | 10 + + drivers/iommu/iommu.c | 41 +- + drivers/iommu/iommufd/device.c | 651 +++++++++++++++-------- + drivers/iommu/iommufd/hw_pagetable.c | 134 ++++- + drivers/iommu/iommufd/io_pagetable.c | 27 +- + drivers/iommu/iommufd/ioas.c | 14 +- + drivers/iommu/iommufd/iommufd_private.h | 78 ++- + drivers/iommu/iommufd/iommufd_test.h | 8 +- + drivers/iommu/iommufd/main.c | 17 +- + drivers/iommu/iommufd/selftest.c | 259 +++++++-- + drivers/iommu/iommufd/vfio_compat.c | 2 +- + drivers/vfio/iommufd.c | 37 +- + drivers/vfio/vfio_main.c | 5 +- + include/linux/iommufd.h | 6 +- + include/linux/vfio.h | 1 - + include/uapi/linux/iommufd.h | 26 + + samples/vfio-mdev/mbochs.c | 3 + + samples/vfio-mdev/mdpy.c | 3 + + samples/vfio-mdev/mtty.c | 3 + + tools/testing/selftests/iommu/iommufd.c | 160 ++++-- + tools/testing/selftests/iommu/iommufd_fail_nth.c | 74 ++- + tools/testing/selftests/iommu/iommufd_utils.h | 69 ++- + 22 files changed, 1228 insertions(+), 400 deletions(-) + create mode 100644 drivers/iommu/iommu-priv.h |