diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 12437 |
1 files changed, 12437 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..e81891c43d76 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12437 @@ +$ date -R +Tue, 30 Apr 2024 09:36:39 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 47% (3999/8505)
Updating files: 48% (4083/8505)
Updating files: 49% (4168/8505)
Updating files: 50% (4253/8505)
Updating files: 51% (4338/8505)
Updating files: 52% (4423/8505)
Updating files: 53% (4508/8505)
Updating files: 54% (4593/8505)
Updating files: 55% (4678/8505)
Updating files: 56% (4763/8505)
Updating files: 57% (4848/8505)
Updating files: 58% (4933/8505)
Updating files: 59% (5018/8505)
Updating files: 60% (5103/8505)
Updating files: 61% (5189/8505)
Updating files: 62% (5274/8505)
Updating files: 63% (5359/8505)
Updating files: 64% (5444/8505)
Updating files: 65% (5529/8505)
Updating files: 66% (5614/8505)
Updating files: 67% (5699/8505)
Updating files: 68% (5784/8505)
Updating files: 69% (5869/8505)
Updating files: 70% (5954/8505)
Updating files: 71% (6039/8505)
Updating files: 72% (6124/8505)
Updating files: 73% (6209/8505)
Updating files: 74% (6294/8505)
Updating files: 75% (6379/8505)
Updating files: 76% (6464/8505)
Updating files: 77% (6549/8505)
Updating files: 78% (6634/8505)
Updating files: 79% (6719/8505)
Updating files: 80% (6804/8505)
Updating files: 81% (6890/8505)
Updating files: 82% (6975/8505)
Updating files: 83% (7060/8505)
Updating files: 84% (7145/8505)
Updating files: 85% (7230/8505)
Updating files: 86% (7315/8505)
Updating files: 87% (7400/8505)
Updating files: 88% (7485/8505)
Updating files: 89% (7570/8505)
Updating files: 90% (7655/8505)
Updating files: 91% (7740/8505)
Updating files: 92% (7825/8505)
Updating files: 93% (7910/8505)
Updating files: 93% (7949/8505)
Updating files: 94% (7995/8505)
Updating files: 95% (8080/8505)
Updating files: 96% (8165/8505)
Updating files: 97% (8250/8505)
Updating files: 98% (8335/8505)
Updating files: 99% (8420/8505)
Updating files: 100% (8505/8505)
Updating files: 100% (8505/8505), done. +HEAD is now at e67572cd2204 Linux 6.9-rc6 +Merging origin/master (98369dccd2f8 Merge tag 'wq-for-6.9-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating e67572cd2204..98369dccd2f8 +Fast-forward (no commit created; -m option ignored) + Documentation/core-api/workqueue.rst | 6 +- + .../translations/zh_CN/core-api/workqueue.rst | 398 +++++++++++++++++++-- + drivers/scsi/sd.c | 4 +- + fs/bcachefs/btree_node_scan.c | 7 +- + fs/bcachefs/btree_node_scan_types.h | 1 + + fs/bcachefs/buckets.c | 2 - + fs/bcachefs/inode.c | 2 +- + fs/erofs/fscache.c | 2 +- + fs/erofs/internal.h | 7 - + fs/erofs/super.c | 124 +++---- + fs/nfs/inode.c | 7 +- + fs/nfsd/nfs4xdr.c | 2 +- + kernel/bounds.c | 2 +- + kernel/workqueue.c | 19 +- + net/sunrpc/xprtsock.c | 1 + + 15 files changed, 465 insertions(+), 119 deletions(-) +Merging fixes/fixes (2dde18cd1d8f Linux 6.5) +$ 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 (bcf28f9e63d4 selftests/vDSO: fix runtime errors on LoongArch) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 ++- + fs/proc/task_mmu.c | 24 +++++++++++--------- + fs/userfaultfd.c | 4 ++++ + include/linux/compiler_types.h | 11 +++++++++ + lib/maple_tree.c | 16 ++++++------- + lib/test_xarray.c | 13 +++++++---- + mm/page_owner.c | 4 ++-- + mm/readahead.c | 4 ++++ + mm/vmalloc.c | 2 +- + tools/testing/radix-tree/linux/kernel.h | 2 ++ + tools/testing/selftests/vDSO/vdso_config.h | 6 ++++- + tools/testing/selftests/vDSO/vdso_test_getcpu.c | 16 +++++-------- + .../selftests/vDSO/vdso_test_gettimeofday.c | 26 ++++++---------------- + 13 files changed, 75 insertions(+), 56 deletions(-) +Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6) +$ 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 (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save()) +$ 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 (daa1bd43e56b Merge tag 'mtk-soc-fixes-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into for-next) +$ 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 'ort' strategy. +Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-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 (4cece7649650 Linux 6.9-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 sophgo-fixes/fixes (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1) +$ 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 (210cfef57926 selftests/powerpc/papr-vpd: Fix missing variable initialization) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (b961ec10b9f9 s390/vdso: Add CFI for RA register to asm macro vdso_func) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/include/asm/dwarf.h | 1 + + arch/s390/kernel/vdso64/vdso_user_wrapper.S | 2 ++ + arch/s390/mm/gmap.c | 2 +- + arch/s390/mm/hugetlbpage.c | 2 +- + drivers/s390/char/raw3270.c | 6 ++++-- + 5 files changed, 9 insertions(+), 4 deletions(-) +Merging fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ 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 (ba1cb99b559e Merge branch 'vxlan-stats') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 16 ++++-- + arch/arm/net/bpf_jit_32.c | 56 ++++++++++++++----- + arch/arm64/net/bpf_jit_comp.c | 6 +-- + arch/riscv/net/bpf_jit_comp64.c | 6 +-- + arch/x86/net/bpf_jit_comp.c | 63 +++++++++++----------- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 +++++- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 4 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 8 ++- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 ++- + drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 4 +- + drivers/net/ethernet/intel/ice/ice_debugfs.c | 8 +-- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 14 ++--- + drivers/net/vxlan/vxlan_core.c | 30 ++++++----- + include/linux/filter.h | 1 + + include/linux/skmsg.h | 2 + + kernel/bpf/core.c | 9 ++++ + kernel/bpf/verifier.c | 33 +++++++++++- + lib/Kconfig.debug | 5 +- + lib/scatterlist.c | 2 +- + net/core/filter.c | 42 +++++++++++---- + net/core/skmsg.c | 5 +- + net/l2tp/l2tp_eth.c | 3 ++ + net/nsh/nsh.c | 14 ++--- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 3 ++ + 26 files changed, 248 insertions(+), 113 deletions(-) +Merging bpf/master (b867247555c4 Merge branch 'qed-error-codes') +$ 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 (58fbfecab965 xfrm: Preserve vlan tags for transport mode software GRO) +$ 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 'ort' strategy. + include/linux/skbuff.h | 15 +++++++++++++++ + include/net/xfrm.h | 3 +++ + net/ipv4/xfrm4_input.c | 6 +++++- + net/ipv6/xfrm6_input.c | 6 +++++- + net/xfrm/xfrm_input.c | 8 ++++++++ + net/xfrm/xfrm_policy.c | 2 ++ + 6 files changed, 38 insertions(+), 2 deletions(-) +Merging netfilter/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (52afb15e9d9a Merge tag 'net-6.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (ed30a4a51bb1 Linux 6.9-rc5) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (c158cf914713 ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()) +$ 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 'ort' strategy. + include/sound/emu10k1.h | 7 +- + sound/hda/intel-dsp-config.c | 27 ++++++- + sound/hda/intel-sdw-acpi.c | 2 + + sound/pci/emu10k1/emu10k1.c | 3 +- + sound/pci/emu10k1/emu10k1_main.c | 158 +++++++++++++++++++++++---------------- + sound/pci/emu10k1/emumixer.c | 18 +++-- + sound/pci/emu10k1/emuproc.c | 9 +++ + sound/pci/emu10k1/io.c | 51 ++++++------- + sound/pci/hda/patch_realtek.c | 1 + + 9 files changed, 170 insertions(+), 106 deletions(-) +Merging sound-asoc-fixes/for-linus (bda16500dd0b ASoC: rt715-sdca: volume step modification) +$ 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 'ort' strategy. + Documentation/devicetree/bindings/sound/rt5645.txt | 6 + + drivers/base/regmap/regmap.c | 37 +++++++ + include/linux/regmap.h | 8 ++ + include/sound/cs35l56.h | 2 + + sound/pci/hda/cs35l56_hda.c | 4 + + sound/soc/amd/yc/acp6x-mach.c | 7 ++ + sound/soc/codecs/cs35l41.c | 28 +++-- + sound/soc/codecs/cs35l56-sdw.c | 2 - + sound/soc/codecs/cs35l56-shared.c | 85 ++++++++++----- + sound/soc/codecs/cs35l56.c | 26 ++++- + sound/soc/codecs/rt5645.c | 25 +++++ + sound/soc/codecs/rt715-sdca.c | 8 +- + sound/soc/codecs/rt715-sdw.c | 1 + + sound/soc/codecs/rt722-sdca.c | 27 +++-- + sound/soc/codecs/rt722-sdca.h | 3 + + sound/soc/codecs/wsa881x.c | 1 + + sound/soc/intel/avs/icl.c | 2 +- + sound/soc/intel/avs/topology.c | 2 + + sound/soc/intel/boards/bytcr_rt5640.c | 24 ++-- + sound/soc/sof/core.c | 4 +- + sound/soc/sof/debug.c | 18 +++ + sound/soc/sof/intel/pci-lnl.c | 3 + + sound/soc/sof/ipc3-pcm.c | 1 + + sound/soc/sof/ipc4-pcm.c | 121 ++++++++++++++------- + sound/soc/sof/pcm.c | 13 +-- + sound/soc/sof/sof-audio.h | 2 + + sound/soc/tegra/tegra186_dspk.c | 7 +- + sound/soc/ti/davinci-mcasp.c | 12 +- + 28 files changed, 359 insertions(+), 120 deletions(-) +Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3) +$ 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 (ff33132605c1 regulator: change devm_regulator_get_enable_optional() stub to return Ok) +$ 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 'ort' strategy. + drivers/regulator/irq_helpers.c | 3 +++ + drivers/regulator/mt6360-regulator.c | 32 ++++++++++++++++++----------- + drivers/regulator/qcom-refgen-regulator.c | 1 + + drivers/regulator/vqmmc-ipq4019-regulator.c | 1 + + include/linux/regulator/consumer.h | 4 ++-- + 5 files changed, 27 insertions(+), 14 deletions(-) +Merging spi-fixes/for-linus (7430764f5a85 spi: hisi-kunpeng: Delete the dump interface of data registers in debugfs) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-axi-spi-engine.c | 2 +- + drivers/spi/spi-hisi-kunpeng.c | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging pci-current/for-linus (4cece7649650 Linux 6.9-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 (ed30a4a51bb1 Linux 6.9-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 (ed30a4a51bb1 Linux 6.9-rc5) +$ 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 (f2004e82abb6 usb: typec: qcom-pmic: fix pdphy start() error handling) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/core/port.c | 8 +- + drivers/usb/dwc3/core.c | 90 +++++++++------------- + drivers/usb/dwc3/core.h | 1 + + drivers/usb/dwc3/gadget.c | 2 + + drivers/usb/dwc3/host.c | 27 +++++++ + drivers/usb/gadget/composite.c | 6 +- + drivers/usb/gadget/function/f_fs.c | 9 ++- + drivers/usb/gadget/function/uvc_configfs.c | 4 +- + drivers/usb/host/xhci-plat.h | 4 +- + drivers/usb/host/xhci-rzv2m.c | 1 + + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 8 +- + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 11 ++- + 12 files changed, 103 insertions(+), 68 deletions(-) +Merging usb-serial-fixes/usb-linus (582ee2f9d268 USB: serial: option: add Telit FN920C04 rmnet compositions) +$ 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 (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered) +$ 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 (39cd87c4eb2b Linux 6.9-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 (3c324a40b7c3 iio: temperature: mcp9600: Fix temperature reading for negative values) +$ 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 'ort' strategy. + .../bindings/iio/health/maxim,max30102.yaml | 2 +- + drivers/iio/accel/mxc4005.c | 92 ++++++++++++++++++++-- + drivers/iio/adc/pac1934.c | 9 +++ + .../iio/common/inv_sensors/inv_sensors_timestamp.c | 33 ++++---- + drivers/iio/imu/adis16475.c | 4 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 20 ++--- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 1 + + drivers/iio/pressure/bmp280-spi.c | 13 +-- + drivers/iio/pressure/bmp280.h | 1 + + drivers/iio/temperature/mcp9600.c | 3 +- + drivers/misc/mei/hw-me-regs.h | 2 + + drivers/misc/mei/pci-me.c | 2 + + drivers/misc/mei/pxp/mei_pxp.c | 7 +- + include/linux/iio/common/inv_sensors_timestamp.h | 3 +- + 15 files changed, 143 insertions(+), 51 deletions(-) +Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2) +$ 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 (ee59be35d7a8 misc/pvpanic-pci: register attributes via pci_driver) +$ 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 'ort' strategy. + drivers/misc/pvpanic/pvpanic-pci.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6) +$ 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 (e67572cd2204 Linux 6.9-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 (be81415a32ef Input: xpad - add support for ASUS ROG RAIKIRI) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/joystick/xpad.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case) +$ 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 (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart) +$ 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 (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN) +$ 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 dmaengine-fixes/fixes (e67572cd2204 Linux 6.9-rc6) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets) +$ 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 (0bbac3facb5d Linux 6.9-rc4) +$ 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 (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property) +$ 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 (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) +$ 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 (44ecfa3e5f1c Merge branch 'svm' of https://github.com/kvm-x86/linux 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 (83303a4c776c KVM: s390: fix cc for successful PQAP) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ 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 (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt 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 (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Merge made by the 'ort' strategy. + drivers/cxl/core/port.c | 15 ++++++++++++++- + tools/testing/cxl/test/cxl.c | 7 +++++++ + 2 files changed, 21 insertions(+), 1 deletion(-) +Merging btrfs-fixes/next-fixes (3550bc7dc848 Merge branch 'misc-6.9' 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 +Merge made by the 'ort' strategy. + fs/btrfs/ioctl.c | 33 ++++++++++++++++++++++++++++++--- + fs/btrfs/qgroup.c | 21 ++++++++------------- + fs/btrfs/volumes.c | 1 + + 3 files changed, 39 insertions(+), 16 deletions(-) +Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + drivers/infiniband/hw/qib/qib_fs.c | 1 + + 1 file changed, 1 insertion(+) +Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages) +$ 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 (515a3c3a5489 platform/x86: ISST: Add Grand Ridge to HPM CPU 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 +Merge made by the 'ort' strategy. + drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 1 + + 1 file changed, 1 insertion(+) +Merging samsung-krzk-fixes/fixes (da244c16ac58 clk: samsung: Revert "clk: Use device_get_match_data()") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Merge made by the 'ort' strategy. + drivers/clk/samsung/clk-exynos-clkout.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-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 (dab6bc78e981 of: module: add buffer overflow check in of_modalias()) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + drivers/of/module.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-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 (961990efc608 scsi: sd: Only print updates to permanent stream count) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (e67572cd2204 Linux 6.9-rc6) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (e67572cd2204 Linux 6.9-rc6) +$ 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 (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-rc1) +$ 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 (0bbac3facb5d Linux 6.9-rc4) +$ 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 (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'ort' strategy. + arch/x86/hyperv/ivm.c | 14 ++++++++------ + drivers/hv/vmbus_drv.c | 6 +++--- + tools/hv/hv_kvp_daemon.c | 14 ++++++++++++++ + 3 files changed, 25 insertions(+), 9 deletions(-) +Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) +$ 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 (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware) +$ 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 +Merge made by the 'ort' strategy. + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 99 ---------------------- + 1 file changed, 99 deletions(-) +Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex) +$ 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 +Merge made by the 'ort' strategy. + drivers/cache/sifive_ccache.c | 2 +- + drivers/firmware/microchip/mpfs-auto-update.c | 8 +++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) +Merging fpga-fixes/fixes (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Merge made by the 'ort' strategy. + drivers/fpga/dfl-pci.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging spdx/spdx-linus (4cece7649650 Linux 6.9-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 (c714fcdf5b75 Merge tag 'intel-gpio-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current) +$ 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 +Already up to date. +Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data) +$ 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 (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 78 +++++++++++++++++--------------- + drivers/pinctrl/intel/pinctrl-intel.h | 4 ++ + 2 files changed, 45 insertions(+), 37 deletions(-) +Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode) +$ 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 (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests) +$ 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 memblock-fixes/fixes (592447f6cb3c memblock tests: fix undefined reference to `BIT') +$ 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 (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) +$ 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 perf-current/perf-tools (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/unaccepted_memory.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) +$ 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 (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/mt6360_charger.c | 2 +- + drivers/power/supply/rt9455_charger.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) +$ 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 iommufd-fixes/for-rc (2760c51b8040 iommufd: Add config needed for iommufd_fail_nth) +$ 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 (e67572cd2204 Linux 6.9-rc6) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (d05dcfdf5e16 fs/9p: mitigate inode collisions) +$ 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 w1-fixes/fixes (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (39cd87c4eb2b Linux 6.9-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) +$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging i2c-host-fixes/i2c/i2c-host-fixes (e67572cd2204 Linux 6.9-rc6) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Already up to date. +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (f8981b0d5295 Merge tag 'qcom-clk-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes) +$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Merge made by the 'ort' strategy. + drivers/clk/qcom/clk-smd-rpm.c | 1 + + drivers/clk/qcom/gdsc.c | 11 ++++++++--- + 2 files changed, 9 insertions(+), 3 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (e4236b14fe32 drm/imagination: Ensure PVR_MIPS_PT_PAGE_COUNT is never zero) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/imagination/pvr_fw_mips.h | 5 +++-- + drivers/gpu/drm/ttm/ttm_tt.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 1 + + 3 files changed, 5 insertions(+), 3 deletions(-) +Merging mm-stable/mm-stable (72801513b2bf mm: set pageblock_order to HPAGE_PMD_ORDER in case with !CONFIG_HUGETLB_PAGE but THP enabled) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm64/mm/hugetlbpage.c +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/powerpc/kernel/iommu.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/s390/mm/hugetlbpage.c +Auto-merging arch/x86/Kconfig +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/skmsg.h +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging lib/test_xarray.c +Auto-merging mm/page_owner.c +Auto-merging mm/readahead.c +Auto-merging mm/vmalloc.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/cgroup-v1/memory.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/admin-guide/mm/hugetlbpage.rst | 7 + + Documentation/admin-guide/sysctl/vm.rst | 16 + + Documentation/filesystems/proc.rst | 29 + + Documentation/mm/allocation-profiling.rst | 100 +++ + Documentation/mm/index.rst | 1 + + Documentation/mm/vmemmap_dedup.rst | 22 +- + .../translations/zh_CN/core-api/cachetlb.rst | 2 +- + MAINTAINERS | 18 + + arch/alpha/kernel/osf_sys.c | 5 +- + arch/alpha/kernel/pci_iommu.c | 2 +- + arch/alpha/lib/checksum.c | 1 + + arch/alpha/lib/fpreg.c | 1 + + arch/arc/include/asm/mmu-arcv2.h | 2 + + arch/arc/mm/mmap.c | 4 +- + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/hugetlb.h | 6 +- + arch/arm/include/asm/pgtable-2level.h | 5 +- + arch/arm/include/asm/pgtable-3level-hwdef.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 5 +- + arch/arm/kernel/irq.c | 1 + + arch/arm/kernel/traps.c | 1 + + arch/arm/lib/uaccess_with_memcpy.c | 4 +- + arch/arm/mm/Makefile | 1 - + arch/arm/mm/fault.c | 4 +- + arch/arm/mm/hugetlbpage.c | 34 - + arch/arm/mm/mmap.c | 5 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/hugetlb.h | 6 +- + arch/arm64/include/asm/pgtable.h | 25 +- + arch/arm64/kernel/efi.c | 1 + + arch/arm64/mm/fault.c | 31 +- + arch/arm64/mm/hugetlbpage.c | 18 +- + arch/arm64/mm/mteswap.c | 45 ++ + arch/csky/abiv1/mmap.c | 12 +- + arch/loongarch/Kconfig | 2 +- + arch/loongarch/include/asm/kfence.h | 1 + + arch/loongarch/mm/hugetlbpage.c | 12 +- + arch/loongarch/mm/mmap.c | 3 +- + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/pgtable-32.h | 2 +- + arch/mips/include/asm/pgtable-64.h | 2 +- + arch/mips/jazz/jazzdma.c | 2 +- + arch/mips/mm/hugetlbpage.c | 10 - + arch/mips/mm/mmap.c | 3 +- + arch/mips/mm/tlb-r4k.c | 2 +- + arch/parisc/kernel/sys_parisc.c | 6 +- + arch/parisc/mm/hugetlbpage.c | 11 - + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 20 - + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 25 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 27 +- + arch/powerpc/include/asm/mmu.h | 4 - + arch/powerpc/include/asm/nohash/pgtable.h | 10 - + arch/powerpc/kernel/dma-iommu.c | 2 +- + arch/powerpc/kernel/fadump.c | 5 - + arch/powerpc/kernel/iommu.c | 1 + + arch/powerpc/mm/book3s64/slice.c | 20 +- + arch/powerpc/mm/fault.c | 33 +- + arch/powerpc/mm/mem.c | 1 + + arch/powerpc/mm/pgtable_64.c | 6 +- + arch/powerpc/platforms/ps3/system-bus.c | 4 +- + arch/powerpc/platforms/pseries/vio.c | 2 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/include/asm/hugetlb.h | 6 +- + arch/riscv/include/asm/pgtable.h | 1 + + arch/riscv/kernel/elf_kexec.c | 1 + + arch/riscv/kernel/probes/kprobes.c | 1 + + arch/riscv/mm/fault.c | 5 +- + arch/riscv/mm/hugetlbpage.c | 10 - + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/hugetlb.h | 6 +- + arch/s390/include/asm/pgtable.h | 1 + + arch/s390/kernel/cert_store.c | 1 + + arch/s390/kernel/ipl.c | 1 + + arch/s390/mm/fault.c | 3 +- + arch/s390/mm/hugetlbpage.c | 19 +- + arch/s390/mm/mmap.c | 9 +- + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/hugetlb.h | 6 +- + arch/sh/mm/cache-sh4.c | 5 +- + arch/sh/mm/hugetlbpage.c | 10 - + arch/sh/mm/mmap.c | 5 +- + arch/sparc/include/asm/pgtable_64.h | 3 +- + arch/sparc/kernel/sys_sparc_32.c | 3 +- + arch/sparc/kernel/sys_sparc_64.c | 20 +- + arch/sparc/mm/hugetlbpage.c | 21 +- + arch/sparc/mm/tlb.c | 6 +- + arch/um/include/shared/um_malloc.h | 3 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/io.h | 1 + + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/pgtable_64.h | 1 + + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/cpu/sgx/driver.c | 2 +- + arch/x86/kernel/cpu/sgx/main.c | 1 + + arch/x86/kernel/irq_64.c | 1 + + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/sys_x86_64.c | 42 +- + arch/x86/mm/fault.c | 24 +- + arch/x86/mm/hugetlbpage.c | 35 +- + arch/x86/mm/init.c | 47 -- + arch/x86/mm/mmap.c | 4 +- + arch/x86/mm/numa_32.c | 1 + + arch/x86/mm/pat/memtype.c | 29 +- + arch/x86/mm/pgtable.c | 4 +- + arch/xtensa/mm/cache.c | 6 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 1 + + drivers/block/zram/zram_drv.c | 31 +- + drivers/char/mem.c | 2 +- + drivers/dax/device.c | 6 +- + drivers/gpu/drm/gma500/mmu.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 + + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 1 + + drivers/gpu/drm/i915/gt/shmem_utils.c | 1 + + drivers/gpu/drm/i915/gvt/firmware.c | 1 + + drivers/gpu/drm/i915/gvt/gtt.c | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/gvt/mmio.c | 1 + + drivers/gpu/drm/i915/gvt/vgpu.c | 1 + + drivers/gpu/drm/i915/intel_gvt.c | 1 + + drivers/gpu/drm/imagination/pvr_vm_mips.c | 1 + + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 1 + + drivers/gpu/drm/omapdrm/omap_gem.c | 1 + + drivers/gpu/drm/v3d/v3d_bo.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 1 + + drivers/hwtracing/coresight/coresight-trbe.c | 1 + + drivers/iommu/amd/amd_iommu.h | 5 +- + drivers/iommu/dma-iommu.c | 2 +- + .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.c | 1 + + .../ethernet/marvell/octeon_ep_vf/octep_vf_mbox.c | 1 + + drivers/net/ethernet/microsoft/mana/hw_channel.c | 1 + + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/sba_iommu.c | 2 +- + drivers/platform/x86/uv_sysfs.c | 1 + + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 + + drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 +- + drivers/vfio/pci/pds/dirty.c | 1 + + drivers/virt/acrn/mm.c | 11 +- + drivers/virtio/virtio_mem.c | 1 + + drivers/xen/grant-dma-ops.c | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + fs/dax.c | 14 +- + fs/exec.c | 11 + + fs/hugetlbfs/inode.c | 11 +- + fs/nfs/iostat.h | 5 +- + fs/proc/inode.c | 10 +- + fs/proc/meminfo.c | 3 +- + fs/proc/page.c | 73 +- + fs/proc/task_mmu.c | 69 +- + fs/ramfs/file-mmu.c | 2 +- + fs/userfaultfd.c | 5 +- + include/acpi/platform/aclinuxex.h | 19 +- + include/asm-generic/codetag.lds.h | 14 + + include/asm-generic/io.h | 2 +- + include/asm-generic/pgalloc.h | 35 +- + include/asm-generic/vmlinux.lds.h | 3 + + include/crypto/hash.h | 7 +- + include/crypto/internal/acompress.h | 5 +- + include/crypto/skcipher.h | 7 +- + include/linux/alloc_tag.h | 216 ++++++ + include/linux/bpf.h | 33 +- + include/linux/bpfptr.h | 5 +- + include/linux/codetag.h | 81 ++ + include/linux/dma-fence-chain.h | 6 +- + include/linux/dma-map-ops.h | 2 +- + include/linux/fortify-string.h | 5 +- + include/linux/fs.h | 6 +- + include/linux/gfp.h | 130 ++-- + include/linux/gfp_types.h | 11 + + include/linux/hid_bpf.h | 6 +- + include/linux/huge_mm.h | 79 +- + include/linux/hugetlb.h | 81 +- + include/linux/io.h | 1 + + include/linux/jbd2.h | 12 +- + include/linux/ksm.h | 21 +- + include/linux/memcontrol.h | 59 +- + include/linux/mempolicy.h | 5 +- + include/linux/mempool.h | 73 +- + include/linux/mm.h | 128 ++-- + include/linux/mm_types.h | 21 +- + include/linux/mmap_lock.h | 10 +- + include/linux/page-flags.h | 56 +- + include/linux/page-isolation.h | 5 +- + include/linux/page_ext.h | 5 +- + include/linux/page_idle.h | 68 +- + include/linux/pageblock-flags.h | 8 +- + include/linux/pagemap.h | 15 +- + include/linux/pds/pds_common.h | 2 + + include/linux/percpu.h | 30 +- + include/linux/pgalloc_tag.h | 132 ++++ + include/linux/pgtable.h | 105 ++- + include/linux/ptr_ring.h | 28 +- + include/linux/rhashtable-types.h | 11 +- + include/linux/rmap.h | 8 +- + include/linux/sched.h | 24 + + include/linux/sched/coredump.h | 5 +- + include/linux/sched/mm.h | 22 + + include/linux/secretmem.h | 21 +- + include/linux/skb_array.h | 19 +- + include/linux/skbuff.h | 20 +- + include/linux/skmsg.h | 8 +- + include/linux/slab.h | 186 ++--- + include/linux/sockptr.h | 10 +- + include/linux/string.h | 4 +- + include/linux/swap.h | 35 +- + include/linux/vmalloc.h | 62 +- + include/linux/vmstat.h | 8 - + include/linux/xarray.h | 6 + + include/linux/zpool.h | 4 +- + include/linux/zswap.h | 2 +- + include/net/netlabel.h | 16 +- + include/net/netlink.h | 5 +- + include/net/request_sock.h | 5 +- + include/net/tcx.h | 5 +- + include/rdma/rdmavt_qp.h | 1 + + include/trace/events/fs_dax.h | 16 +- + include/trace/events/huge_memory.h | 12 +- + include/trace/events/mmflags.h | 2 +- + init/Kconfig | 4 + + io_uring/io_uring.c | 2 +- + kernel/bpf/arena.c | 2 +- + kernel/bpf/memalloc.c | 6 +- + kernel/bpf/syscall.c | 2 +- + kernel/dma/mapping.c | 4 +- + kernel/events/core.c | 4 +- + kernel/fork.c | 2 +- + kernel/kallsyms_selftest.c | 2 +- + kernel/module/main.c | 29 +- + kernel/vmcore_info.c | 3 +- + lib/Kconfig.debug | 31 + + lib/Makefile | 3 + + lib/alloc_tag.c | 246 ++++++ + lib/codetag.c | 283 +++++++ + lib/rhashtable.c | 22 +- + lib/test_hmm.c | 8 +- + lib/test_xarray.c | 93 +++ + lib/xarray.c | 53 +- + mm/Kconfig | 8 +- + mm/Makefile | 1 + + mm/backing-dev.c | 23 +- + mm/cma.c | 4 - + mm/compaction.c | 8 +- + mm/debug.c | 25 +- + mm/debug_page_alloc.c | 12 +- + mm/debug_vm_pgtable.c | 1 + + mm/filemap.c | 96 ++- + mm/folio-compat.c | 6 - + mm/gup.c | 779 ++++++++++++------- + mm/hmm.c | 9 +- + mm/huge_memory.c | 293 +++----- + mm/hugetlb.c | 377 ++++------ + mm/hugetlb_vmemmap.c | 1 - + mm/internal.h | 191 +++-- + mm/kasan/hw_tags.c | 1 + + mm/kfence/core.c | 14 +- + mm/kfence/kfence.h | 4 +- + mm/khugepaged.c | 295 ++++---- + mm/kmemleak.c | 6 +- + mm/madvise.c | 129 ++-- + mm/memcontrol.c | 169 +++-- + mm/memory-failure.c | 13 +- + mm/memory.c | 196 ++--- + mm/memory_hotplug.c | 1 + + mm/mempolicy.c | 104 +-- + mm/mempool.c | 36 +- + mm/memremap.c | 30 +- + mm/migrate.c | 37 +- + mm/migrate_device.c | 16 +- + mm/mlock.c | 2 +- + mm/mm_init.c | 216 +++--- + mm/mmap.c | 217 +++--- + mm/mprotect.c | 3 +- + mm/mremap.c | 2 +- + mm/nommu.c | 77 +- + mm/oom_kill.c | 1 - + mm/page-writeback.c | 1 - + mm/page_alloc.c | 826 +++++++++++---------- + mm/page_ext.c | 15 +- + mm/page_io.c | 2 +- + mm/page_isolation.c | 121 ++- + mm/page_owner.c | 2 +- + mm/page_vma_mapped.c | 4 +- + mm/percpu-internal.h | 26 +- + mm/percpu-vm.c | 4 +- + mm/percpu.c | 118 ++- + mm/readahead.c | 8 +- + mm/rmap.c | 20 +- + mm/shmem.c | 13 +- + mm/show_mem.c | 26 + + mm/slab.h | 62 +- + mm/slab_common.c | 6 +- + mm/slub.c | 496 ++++++++----- + mm/sparse.c | 26 +- + mm/swap.c | 47 +- + mm/swap_slots.c | 8 +- + mm/swap_state.c | 10 +- + mm/swapfile.c | 331 +++++---- + mm/truncate.c | 36 +- + mm/userfaultfd.c | 4 +- + mm/util.c | 40 +- + mm/vmalloc.c | 128 ++-- + mm/vmscan.c | 37 +- + mm/z3fold.c | 10 +- + mm/zbud.c | 10 +- + mm/zpool.c | 10 +- + mm/zsmalloc.c | 6 +- + mm/zswap.c | 305 +++----- + net/sunrpc/auth_gss/auth_gss_internal.h | 6 +- + rust/helpers.c | 8 + + scripts/kallsyms.c | 13 + + scripts/kernel-doc | 1 + + scripts/module.lds.S | 7 + + security/Kconfig.hardening | 15 + + sound/pci/hda/cs35l41_hda.c | 1 + + tools/cgroup/memcg_slabinfo.py | 5 +- + tools/include/uapi/linux/memfd.h | 39 + + tools/include/uapi/linux/userfaultfd.h | 386 ++++++++++ + tools/testing/selftests/lib.mk | 9 + + tools/testing/selftests/mm/Makefile | 2 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 135 +++- + tools/testing/selftests/mm/memfd_secret.c | 51 +- + tools/testing/selftests/mm/mlock2-tests.c | 15 +- + tools/testing/selftests/mm/mremap_test.c | 202 +++-- + tools/testing/selftests/mm/run_vmtests.sh | 13 +- + tools/testing/selftests/mm/virtual_address_range.c | 78 +- + tools/testing/selftests/x86/test_shadow_stack.c | 67 +- + 335 files changed, 7003 insertions(+), 4377 deletions(-) + create mode 100644 Documentation/mm/allocation-profiling.rst + delete mode 100644 arch/arm/mm/hugetlbpage.c + create mode 100644 include/asm-generic/codetag.lds.h + create mode 100644 include/linux/alloc_tag.h + create mode 100644 include/linux/codetag.h + create mode 100644 include/linux/pgalloc_tag.h + create mode 100644 lib/alloc_tag.c + create mode 100644 lib/codetag.c + create mode 100644 tools/include/uapi/linux/memfd.h + create mode 100644 tools/include/uapi/linux/userfaultfd.h +Merging mm-nonmm-stable/mm-nonmm-stable (e02577872ff5 crash: add prefix for crash dumping messages) +$ 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 init/main.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kdump/kdump.rst | 8 +- + arch/x86/lib/copy_mc.c | 21 +++++- + block/partitions/ldm.c | 6 +- + drivers/hwtracing/intel_th/core.c | 6 +- + drivers/mux/core.c | 4 +- + drivers/pps/clients/pps_parport.c | 6 +- + fs/binfmt_elf.c | 2 +- + fs/fat/dir.c | 12 +++ + fs/nilfs2/btree.c | 23 ++++-- + fs/nilfs2/gcinode.c | 1 + + fs/nilfs2/recovery.c | 1 + + fs/ocfs2/aops.c | 2 - + fs/ocfs2/dlm/dlmdomain.c | 11 ++- + fs/ocfs2/export.c | 12 +-- + fs/ocfs2/file.c | 2 + + fs/ocfs2/inode.c | 2 + + fs/ocfs2/ioctl.c | 1 + + fs/ocfs2/localalloc.c | 34 ++++----- + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/namei.c | 4 +- + fs/ocfs2/ocfs2_fs.h | 3 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/reservations.c | 2 +- + fs/ocfs2/resize.c | 8 ++ + fs/ocfs2/suballoc.c | 117 +++++++++++++++++++++++++----- + fs/ocfs2/suballoc.h | 6 +- + fs/proc/vmcore.c | 5 +- + fs/squashfs/namei.c | 14 +--- + include/linux/cpumask.h | 5 -- + include/linux/instrumented.h | 35 +++++++++ + include/linux/kmsan-checks.h | 15 ++++ + init/do_mounts_initrd.c | 1 - + init/main.c | 26 ++++++- + ipc/ipc_sysctl.c | 1 - + ipc/mq_sysctl.c | 1 - + kernel/crash_core.c | 2 + + kernel/crash_reserve.c | 4 +- + kernel/kcov.c | 3 +- + kernel/regset.c | 6 +- + kernel/trace/blktrace.c | 3 +- + lib/Kconfig.kgdb | 1 + + lib/build_OID_registry | 5 +- + lib/devres.c | 26 ++++--- + lib/test_hexdump.c | 2 +- + mm/kmsan/hooks.c | 11 +++ + tools/testing/selftests/exec/Makefile | 6 +- + 46 files changed, 334 insertions(+), 136 deletions(-) +Merging mm/mm-everything (3c2a0d2f0ca0 foo) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Makefile +Auto-merging arch/Kconfig +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 6 +- + .../testing/sysfs-kernel-mm-transparent-hugepage | 18 + + Documentation/admin-guide/cgroup-v1/memory.rst | 4 +- + Documentation/admin-guide/cgroup-v2.rst | 18 +- + Documentation/admin-guide/mm/damon/usage.rst | 26 +- + Documentation/admin-guide/mm/transhuge.rst | 35 +- + Documentation/admin-guide/mm/zswap.rst | 29 - + Documentation/core-api/floating-point.rst | 78 + + Documentation/core-api/index.rst | 1 + + Documentation/driver-api/crypto/iaa/iaa-crypto.rst | 2 - + Documentation/filesystems/api-summary.rst | 3 - + Documentation/filesystems/buffer.rst | 12 + + Documentation/filesystems/index.rst | 1 + + Documentation/mm/damon/design.rst | 20 +- + Documentation/mm/page_table_check.rst | 9 +- + Documentation/mm/transhuge.rst | 12 +- + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/mseal.rst | 199 ++ + Makefile | 5 + + arch/Kconfig | 6 + + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/Kconfig | 1 + + arch/arm/Makefile | 7 + + arch/arm/include/asm/fpu.h | 15 + + arch/arm/lib/Makefile | 3 +- + arch/arm/mm/fault.c | 30 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 1 + + arch/arm64/Makefile | 9 +- + arch/arm64/include/asm/fpu.h | 15 + + arch/arm64/include/asm/pgtable.h | 55 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/lib/Makefile | 6 +- + arch/arm64/mm/contpte.c | 29 + + arch/arm64/mm/fault.c | 43 +- + arch/loongarch/Kconfig | 1 + + arch/loongarch/Makefile | 5 +- + arch/loongarch/include/asm/fpu.h | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/Makefile | 5 +- + arch/powerpc/include/asm/fpu.h | 28 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 3 + + arch/riscv/include/asm/fpu.h | 16 + + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/kernel_mode_fpu.c | 28 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/pci/pci_mmio.c | 4 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sh/mm/cache.c | 2 +- + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/Kconfig | 1 + + arch/x86/Makefile | 20 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/fpu.h | 13 + + arch/x86/include/asm/fpu/types.h | 6 +- + arch/x86/include/asm/pgtable.h | 18 +- + arch/x86/mm/pat/memtype.c | 5 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + arch/xtensa/mm/tlb.c | 11 +- + drivers/dax/kmem.c | 30 +- + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 35 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 36 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 36 +- + drivers/media/cec/platform/sti/stih-cec.c | 1 + + drivers/media/rc/mtk-cir.c | 1 + + drivers/media/rc/serial_ir.c | 1 + + drivers/media/rc/st_rc.c | 1 + + drivers/media/rc/sunxi-cir.c | 1 + + drivers/vfio/vfio_iommu_type1.c | 4 +- + drivers/virt/acrn/mm.c | 62 +- + fs/buffer.c | 153 +- + fs/crypto/inline_crypt.c | 6 +- + fs/f2fs/data.c | 5 +- + fs/nilfs2/nilfs.h | 4 +- + fs/nilfs2/super.c | 386 ++-- + fs/nilfs2/the_nilfs.c | 5 +- + fs/nilfs2/the_nilfs.h | 6 +- + fs/ocfs2/dlm/dlmdomain.c | 1 - + fs/proc/task_mmu.c | 24 +- + fs/squashfs/file.c | 6 +- + fs/squashfs/file_direct.c | 3 +- + fs/squashfs/symlink.c | 35 +- + include/linux/bitops.h | 12 +- + include/linux/buffer_head.h | 48 +- + include/linux/damon.h | 2 + + include/linux/fpu.h | 12 + + include/linux/huge_mm.h | 56 +- + include/linux/hugetlb.h | 14 +- + include/linux/kexec.h | 6 +- + include/linux/kfifo.h | 9 +- + include/linux/ksm.h | 14 +- + include/linux/memcontrol.h | 92 +- + include/linux/memory-tiers.h | 13 + + include/linux/mm.h | 99 +- + include/linux/mm_types.h | 14 +- + include/linux/page-flags.h | 8 +- + include/linux/page_ref.h | 15 +- + include/linux/pagemap.h | 7 +- + include/linux/pgtable.h | 74 +- + include/linux/rmap.h | 42 +- + include/linux/swap.h | 5 +- + include/linux/syscalls.h | 1 + + include/linux/writeback.h | 1 + + include/linux/xarray.h | 8 +- + include/trace/events/page_ref.h | 4 +- + include/uapi/asm-generic/unistd.h | 5 +- + kernel/sys_ni.c | 1 + + lib/Kconfig.debug | 2 +- + lib/Makefile | 26 +- + lib/kfifo.c | 10 +- + lib/raid6/Makefile | 33 +- + lib/test_fpu.h | 8 + + lib/{test_fpu.c => test_fpu_glue.c} | 37 +- + lib/test_fpu_impl.c | 37 + + lib/xarray.c | 3 +- + mm/Makefile | 4 + + mm/backing-dev.c | 187 +- + mm/damon/paddr.c | 64 +- + mm/damon/sysfs-schemes.c | 1 + + mm/debug.c | 12 +- + mm/filemap.c | 22 +- + mm/gup.c | 23 +- + mm/huge_memory.c | 209 ++- + mm/hugetlb.c | 29 +- + mm/hugetlb_cgroup.c | 2 +- + mm/hwpoison-inject.c | 11 +- + mm/internal.h | 53 +- + mm/khugepaged.c | 40 +- + mm/ksm.c | 405 ++--- + mm/madvise.c | 119 +- + mm/memcontrol.c | 353 +++- + mm/memory-failure.c | 168 +- + mm/memory-tiers.c | 123 +- + mm/memory.c | 117 +- + mm/memory_hotplug.c | 4 +- + mm/memremap.c | 10 +- + mm/migrate.c | 6 +- + mm/migrate_device.c | 25 +- + mm/mmap.c | 47 +- + mm/mprotect.c | 10 + + mm/mremap.c | 31 + + mm/mseal.c | 307 ++++ + mm/page-writeback.c | 79 +- + mm/page_alloc.c | 62 +- + mm/page_io.c | 1 + + mm/page_table_check.c | 30 + + mm/page_vma_mapped.c | 18 +- + mm/pgtable-generic.c | 2 + + mm/rmap.c | 146 +- + mm/slab.h | 2 - + mm/sparse.c | 2 + + mm/swap.c | 19 +- + mm/swapfile.c | 41 +- + mm/userfaultfd.c | 27 +- + mm/vmalloc.c | 10 +- + mm/vmscan.c | 40 +- + mm/workingset.c | 7 +- + mm/zswap.c | 98 +- + samples/kfifo/dma-example.c | 3 +- + scripts/Makefile.extrawarn | 29 +- + scripts/gdb/linux/cpus.py | 11 +- + scripts/gdb/linux/tasks.py | 2 +- + scripts/gdb/linux/utils.py | 2 +- + tools/include/linux/rbtree_augmented.h | 4 +- + tools/lib/rbtree.c | 2 +- + tools/testing/selftests/mm/.gitignore | 2 + + tools/testing/selftests/mm/Makefile | 2 + + tools/testing/selftests/mm/mseal_test.c | 1893 ++++++++++++++++++++ + tools/testing/selftests/mm/seal_elf.c | 179 ++ + tools/testing/selftests/mm/soft-dirty.c | 2 +- + tools/writeback/wb_monitor.py | 172 ++ + virt/kvm/kvm_main.c | 4 +- + 183 files changed, 5857 insertions(+), 1866 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-transparent-hugepage + create mode 100644 Documentation/core-api/floating-point.rst + create mode 100644 Documentation/filesystems/buffer.rst + create mode 100644 Documentation/userspace-api/mseal.rst + create mode 100644 arch/arm/include/asm/fpu.h + create mode 100644 arch/arm64/include/asm/fpu.h + create mode 100644 arch/powerpc/include/asm/fpu.h + create mode 100644 arch/riscv/include/asm/fpu.h + create mode 100644 arch/riscv/kernel/kernel_mode_fpu.c + create mode 100644 arch/x86/include/asm/fpu.h + create mode 100644 include/linux/fpu.h + create mode 100644 lib/test_fpu.h + rename lib/{test_fpu.c => test_fpu_glue.c} (71%) + create mode 100644 lib/test_fpu_impl.c + create mode 100644 mm/mseal.c + create mode 100644 tools/testing/selftests/mm/mseal_test.c + create mode 100644 tools/testing/selftests/mm/seal_elf.c + create mode 100644 tools/writeback/wb_monitor.py +$ git am -3 ../patches/0001-Revert-mm-vmscan-avoid-split-lazyfree-THP-during-shr.patch +Applying: Revert "mm/vmscan: avoid split lazyfree THP during shrink_folio_list()" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/huge_mm.h +M mm/huge_memory.c +M mm/rmap.c +$ git add -A . +$ git commit -v -a --amend +[master a090746f6690] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Tue Apr 30 09:55:10 2024 +1000 +$ git am -3 ../patches/0002-Revert-mm-rmap-integrate-PMD-mapped-folio-splitting-.patch +Applying: Revert "mm/rmap: integrate PMD-mapped folio splitting into pagewalk loop" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/huge_mm.h +M mm/huge_memory.c +M mm/rmap.c +$ git add -A . +$ git commit -v -a --amend +[master e6479b89df92] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Tue Apr 30 09:55:10 2024 +1000 +Merging kbuild/for-next (060ef2b42249 kconfig: remove 'optional' property support) +$ 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 Makefile +Auto-merging arch/sh/Kconfig +Auto-merging include/asm-generic/vmlinux.lds.h +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/Makefile | 34 ++++++++++++--------- + Documentation/kbuild/kconfig-language.rst | 3 -- + Makefile | 24 +++++++-------- + arch/parisc/kernel/vdso32/Makefile | 7 +---- + arch/sh/Kconfig | 6 +++- + arch/sh/configs/apsh4a3a_defconfig | 1 + + arch/sh/configs/apsh4ad0a_defconfig | 1 + + arch/sh/configs/edosk7705_defconfig | 1 + + arch/sh/configs/hp6xx_defconfig | 1 + + arch/sh/configs/landisk_defconfig | 1 + + arch/sh/configs/magicpanelr2_defconfig | 1 + + arch/sh/configs/rsk7264_defconfig | 1 + + arch/sh/configs/rsk7269_defconfig | 1 + + arch/sh/configs/se7619_defconfig | 1 + + arch/sh/configs/se7705_defconfig | 1 + + arch/sh/configs/se7722_defconfig | 1 + + arch/sh/configs/se7750_defconfig | 1 + + arch/sh/configs/secureedge5410_defconfig | 1 + + arch/sh/configs/sh7710voipgw_defconfig | 1 + + arch/sh/configs/sh7724_generic_defconfig | 1 + + arch/sh/configs/sh7770_generic_defconfig | 1 + + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 + + arch/sh/configs/sh7785lcr_defconfig | 1 + + arch/sh/configs/urquell_defconfig | 1 + + include/asm-generic/vmlinux.lds.h | 19 ++++++++++++ + kernel/kallsyms.c | 6 ---- + kernel/kallsyms_internal.h | 30 ++++++++----------- + kernel/ksysfs.c | 4 +-- + lib/buildid.c | 4 +-- + scripts/Makefile.lib | 2 +- + scripts/kconfig/conf.c | 5 ++-- + scripts/kconfig/confdata.c | 35 +++++----------------- + scripts/kconfig/expr.h | 5 +--- + scripts/kconfig/gconf.c | 4 --- + scripts/kconfig/lexer.l | 1 - + scripts/kconfig/lkc.h | 13 ++++---- + scripts/kconfig/menu.c | 33 +++++++++++++++----- + scripts/kconfig/parser.y | 24 ++------------- + scripts/kconfig/symbol.c | 2 +- + scripts/kconfig/tests/choice/Kconfig | 26 ---------------- + scripts/kconfig/tests/choice/__init__.py | 2 -- + .../kconfig/tests/choice/allmod_expected_config | 4 --- + .../kconfig/tests/choice/allyes_expected_config | 4 --- + .../kconfig/tests/choice/oldask0_expected_stdout | 2 -- + scripts/kconfig/tests/choice/oldask1_config | 1 - + .../kconfig/tests/choice/oldask1_expected_stdout | 6 ---- + scripts/package/buildtar | 24 +++++++-------- + scripts/unifdef.c | 12 ++++---- + 48 files changed, 155 insertions(+), 206 deletions(-) +Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) +$ 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 (8c618b58c89c perf test: Reintroduce -p/--parallel and make -S/--sequential the default) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + tools/arch/x86/include/asm/cpufeatures.h | 7 +- + tools/arch/x86/include/asm/msr-index.h | 9 +- + tools/include/linux/bits.h | 8 +- + tools/include/uapi/asm-generic/bitsperlong.h | 4 + + tools/include/uapi/asm-generic/fcntl.h | 221 -- + tools/include/uapi/linux/bits.h | 15 + + tools/include/uapi/linux/openat2.h | 43 - + tools/lib/perf/cpumap.c | 33 +- + tools/lib/perf/include/perf/cpumap.h | 16 + + tools/lib/perf/libperf.map | 4 + + tools/lib/perf/mmap.c | 2 +- + tools/lib/subcmd/run-command.c | 70 +- + tools/lib/subcmd/run-command.h | 3 + + tools/perf/Build | 14 + + tools/perf/Documentation/perf-arm-spe.txt | 12 +- + tools/perf/Documentation/perf-list.txt | 1 + + tools/perf/Documentation/perf-report.txt | 9 +- + tools/perf/Documentation/perf-script.txt | 7 +- + tools/perf/Documentation/perf-test.txt | 13 +- + tools/perf/Makefile.config | 25 +- + tools/perf/Makefile.perf | 100 +- + tools/perf/arch/arm/util/cs-etm.c | 120 +- + tools/perf/arch/arm64/util/arm-spe.c | 4 +- + tools/perf/arch/arm64/util/header.c | 13 +- + tools/perf/arch/x86/Build | 14 + + tools/perf/arch/x86/tests/Build | 14 + + tools/perf/arch/x86/tests/gen-insn-x86-dat.sh | 2 +- + tools/perf/arch/x86/util/intel-bts.c | 4 +- + tools/perf/arch/x86/util/intel-pt.c | 10 +- + tools/perf/bench/bench.h | 2 + + tools/perf/bench/uprobe.c | 22 +- + tools/perf/builtin-annotate.c | 122 +- + tools/perf/builtin-bench.c | 2 + + tools/perf/builtin-c2c.c | 8 +- + tools/perf/builtin-inject.c | 27 +- + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-list.c | 24 +- + tools/perf/builtin-record.c | 14 +- + tools/perf/builtin-report.c | 7 +- + tools/perf/builtin-sched.c | 11 +- + tools/perf/builtin-script.c | 66 +- + tools/perf/builtin-stat.c | 36 +- + tools/perf/builtin-trace.c | 28 +- + tools/perf/builtin.h | 4 +- + tools/perf/check-headers.sh | 23 +- + tools/perf/perf-archive.sh | 2 +- + tools/perf/perf-completion.sh | 23 +- + tools/perf/perf.c | 23 +- + .../arch/arm64/ampere/ampereone/cache.json | 4 +- + .../arch/arm64/ampere/ampereonex/cache.json | 4 +- + .../pmu-events/arch/s390/cf_z16/transaction.json | 28 +- + tools/perf/pmu-events/arch/s390/mapfile.csv | 2 +- + .../arch/x86/broadwellx/bdx-metrics.json | 35 +- + .../arch/x86/cascadelakex/clx-metrics.json | 85 +- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 10 +- + .../pmu-events/arch/x86/cascadelakex/memory.json | 2 +- + .../pmu-events/arch/x86/cascadelakex/other.json | 2 +- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 2 +- + .../arch/x86/cascadelakex/uncore-interconnect.json | 14 +- + .../arch/x86/cascadelakex/virtual-memory.json | 2 +- + .../arch/x86/emeraldrapids/frontend.json | 2 +- + .../pmu-events/arch/x86/emeraldrapids/memory.json | 1 + + .../arch/x86/emeraldrapids/pipeline.json | 3 + + .../arch/x86/emeraldrapids/uncore-cache.json | 112 +- + .../x86/emeraldrapids/uncore-interconnect.json | 26 +- + .../pmu-events/arch/x86/grandridge/pipeline.json | 43 +- + .../arch/x86/grandridge/uncore-cache.json | 28 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 35 +- + .../pmu-events/arch/x86/icelakex/frontend.json | 2 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 95 +- + .../perf/pmu-events/arch/x86/icelakex/memory.json | 1 + + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 22 +- + .../arch/x86/icelakex/uncore-interconnect.json | 64 +- + .../pmu-events/arch/x86/icelakex/uncore-io.json | 11 - + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 24 +- + .../pmu-events/arch/x86/lunarlake/frontend.json | 2 +- + .../perf/pmu-events/arch/x86/lunarlake/memory.json | 4 +- + .../perf/pmu-events/arch/x86/lunarlake/other.json | 4 +- + .../pmu-events/arch/x86/lunarlake/pipeline.json | 109 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 20 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 30 + + .../pmu-events/arch/x86/meteorlake/frontend.json | 4 +- + .../pmu-events/arch/x86/meteorlake/memory.json | 20 + + .../perf/pmu-events/arch/x86/meteorlake/other.json | 42 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 44 +- + .../arch/x86/meteorlake/uncore-interconnect.json | 22 +- + .../pmu-events/arch/x86/sapphirerapids/cache.json | 1 + + .../arch/x86/sapphirerapids/frontend.json | 2 +- + .../pmu-events/arch/x86/sapphirerapids/memory.json | 1 + + .../arch/x86/sapphirerapids/pipeline.json | 19 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 119 +- + .../arch/x86/sapphirerapids/uncore-cache.json | 112 +- + .../x86/sapphirerapids/uncore-interconnect.json | 26 +- + .../pmu-events/arch/x86/sierraforest/pipeline.json | 36 +- + .../perf/pmu-events/arch/x86/skylake/frontend.json | 10 +- + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 9 + + .../pmu-events/arch/x86/skylakex/frontend.json | 10 +- + .../perf/pmu-events/arch/x86/skylakex/memory.json | 2 +- + tools/perf/pmu-events/arch/x86/skylakex/other.json | 2 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 2 +- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 85 +- + .../arch/x86/skylakex/uncore-interconnect.json | 14 +- + .../pmu-events/arch/x86/skylakex/uncore-io.json | 2 +- + .../arch/x86/skylakex/virtual-memory.json | 2 +- + .../arch/x86/snowridgex/uncore-cache.json | 4 +- + .../arch/x86/snowridgex/uncore-interconnect.json | 6 +- + .../pmu-events/arch/x86/snowridgex/uncore-io.json | 11 - + tools/perf/scripts/python/parallel-perf.py | 988 +++++++++ + tools/perf/tests/bitmap.c | 13 +- + tools/perf/tests/builtin-test.c | 62 +- + tools/perf/tests/code-reading.c | 10 +- + tools/perf/tests/config-fragments/config | 3 + + tools/perf/tests/evsel-roundtrip-name.c | 4 +- + tools/perf/tests/parse-events.c | 45 +- + tools/perf/tests/shell/annotate.sh | 83 + + .../tests/shell/base_probe/test_adding_kernel.sh | 1 + + tools/perf/tests/shell/lib/stat_output.sh | 2 +- + tools/perf/tests/shell/script.sh | 26 +- + tools/perf/tests/shell/stat+json_output.sh | 2 +- + tools/perf/tests/shell/stat_bpf_counters.sh | 71 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 4 +- + tools/perf/tests/shell/test_arm_coresight.sh | 2 +- + tools/perf/tests/topology.c | 46 +- + tools/perf/tests/workloads/datasym.c | 16 + + tools/perf/trace/beauty/Build | 15 + + .../beauty}/arch/x86/include/asm/irq_vectors.h | 0 + .../beauty}/arch/x86/include/uapi/asm/prctl.h | 0 + tools/perf/trace/beauty/arch_errno_names.sh | 8 +- + tools/perf/trace/beauty/beauty.h | 7 +- + tools/perf/trace/beauty/clone.c | 46 +- + tools/perf/trace/beauty/clone.sh | 17 + + tools/perf/trace/beauty/fcntl.c | 2 +- + tools/perf/trace/beauty/flock.c | 2 +- + tools/perf/trace/beauty/fs_at_flags.c | 58 + + tools/perf/trace/beauty/fs_at_flags.sh | 21 + + tools/perf/trace/beauty/fsconfig.sh | 6 +- + tools/perf/trace/beauty/fsmount.c | 9 +- + tools/perf/trace/beauty/fsmount.sh | 6 +- + tools/perf/trace/beauty/fspick.sh | 6 +- + .../trace/beauty}/include/uapi/linux/fcntl.h | 0 + .../trace/beauty}/include/uapi/linux/fs.h | 0 + .../trace/beauty}/include/uapi/linux/mount.h | 0 + .../trace/beauty}/include/uapi/linux/prctl.h | 0 + .../trace/beauty}/include/uapi/linux/sched.h | 0 + tools/perf/trace/beauty/include/uapi/linux/stat.h | 195 ++ + .../beauty}/include/uapi/linux/usbdevice_fs.h | 0 + .../trace/beauty}/include/uapi/linux/vhost.h | 20 +- + .../trace/beauty}/include/uapi/sound/asound.h | 0 + tools/perf/trace/beauty/mount_flags.sh | 6 +- + tools/perf/trace/beauty/move_mount_flags.sh | 6 +- + tools/perf/trace/beauty/prctl.c | 2 +- + tools/perf/trace/beauty/prctl_option.sh | 6 +- + tools/perf/trace/beauty/rename_flags.sh | 2 +- + tools/perf/trace/beauty/sndrv_ctl_ioctl.sh | 4 +- + tools/perf/trace/beauty/sndrv_pcm_ioctl.sh | 4 +- + tools/perf/trace/beauty/statx.c | 67 +- + tools/perf/trace/beauty/statx_mask.sh | 23 + + tools/perf/trace/beauty/sync_file_range.c | 11 +- + tools/perf/trace/beauty/sync_file_range.sh | 2 +- + .../trace/beauty/tracepoints/x86_irq_vectors.sh | 6 +- + tools/perf/trace/beauty/usbdevfs_ioctl.sh | 6 +- + tools/perf/trace/beauty/vhost_virtio_ioctl.sh | 6 +- + tools/perf/trace/beauty/x86_arch_prctl.sh | 4 +- + tools/perf/ui/browsers/Build | 1 + + tools/perf/ui/browsers/annotate-data.c | 312 +++ + tools/perf/ui/browsers/annotate.c | 15 +- + tools/perf/ui/browsers/hists.c | 31 + + tools/perf/ui/hist.c | 92 +- + tools/perf/util/Build | 15 + + tools/perf/util/annotate-data.c | 1529 +++++++++++++- + tools/perf/util/annotate-data.h | 74 +- + tools/perf/util/annotate.c | 2208 +++++--------------- + tools/perf/util/annotate.h | 129 +- + tools/perf/util/auxtrace.c | 8 +- + tools/perf/util/bpf_kwork.c | 16 +- + tools/perf/util/bpf_kwork_top.c | 12 +- + .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 21 + + tools/perf/util/bpf_skel/bench_uprobe.bpf.c | 16 + + tools/perf/util/build-id.c | 120 +- + tools/perf/util/build-id.h | 2 - + tools/perf/util/cpumap.c | 12 +- + tools/perf/util/debug.c | 3 + + tools/perf/util/debug.h | 1 + + tools/perf/util/disasm.c | 1837 ++++++++++++++++ + tools/perf/util/disasm.h | 112 + + tools/perf/util/dso.c | 63 + + tools/perf/util/dso.h | 102 +- + tools/perf/util/dsos.c | 353 +++- + tools/perf/util/dsos.h | 24 +- + tools/perf/util/dump-insn.h | 1 + + tools/perf/util/dwarf-aux.c | 328 ++- + tools/perf/util/dwarf-aux.h | 33 +- + tools/perf/util/genelf.h | 3 + + tools/perf/util/help-unknown-cmd.c | 51 +- + tools/perf/util/hist.c | 12 +- + tools/perf/util/hist.h | 209 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 + + tools/perf/util/intel-pt.c | 2 + + tools/perf/util/machine.c | 168 +- + tools/perf/util/machine.h | 4 +- + tools/perf/util/map.c | 21 +- + tools/perf/util/map.h | 3 + + tools/perf/util/metricgroup.c | 7 +- + tools/perf/util/metricgroup.h | 1 + + tools/perf/util/parse-events.c | 512 ++--- + tools/perf/util/parse-events.h | 49 +- + tools/perf/util/parse-events.l | 196 +- + tools/perf/util/parse-events.y | 265 +-- + tools/perf/util/perf_event_attr_fprintf.c | 26 +- + tools/perf/util/pmu.c | 110 +- + tools/perf/util/pmu.h | 6 +- + tools/perf/util/pmus.c | 94 + + tools/perf/util/pmus.h | 1 + + tools/perf/util/print-events.c | 57 +- + tools/perf/util/print_insn.c | 75 +- + tools/perf/util/print_insn.h | 8 +- + tools/perf/util/probe-event.c | 7 +- + tools/perf/util/python.c | 10 + + tools/perf/util/record.c | 2 +- + .../util/scripting-engines/trace-event-python.c | 12 +- + tools/perf/util/session.c | 26 +- + tools/perf/util/session.h | 2 + + tools/perf/util/sort.c | 30 +- + tools/perf/util/sort.h | 190 +- + tools/perf/util/stat.c | 2 +- + tools/perf/util/stat.h | 1 + + tools/perf/util/svghelper.c | 20 +- + tools/perf/util/values.h | 1 + + tools/perf/util/vdso.c | 48 +- + 230 files changed, 9742 insertions(+), 4591 deletions(-) + delete mode 100644 tools/include/uapi/asm-generic/fcntl.h + create mode 100644 tools/include/uapi/linux/bits.h + delete mode 100644 tools/include/uapi/linux/openat2.h + create mode 100755 tools/perf/scripts/python/parallel-perf.py + create mode 100755 tools/perf/tests/shell/annotate.sh + rename tools/{ => perf/trace/beauty}/arch/x86/include/asm/irq_vectors.h (100%) + rename tools/{ => perf/trace/beauty}/arch/x86/include/uapi/asm/prctl.h (100%) + create mode 100755 tools/perf/trace/beauty/clone.sh + create mode 100644 tools/perf/trace/beauty/fs_at_flags.c + create mode 100755 tools/perf/trace/beauty/fs_at_flags.sh + rename tools/{ => perf/trace/beauty}/include/uapi/linux/fcntl.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/fs.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/mount.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/prctl.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/sched.h (100%) + create mode 100644 tools/perf/trace/beauty/include/uapi/linux/stat.h + rename tools/{ => perf/trace/beauty}/include/uapi/linux/usbdevice_fs.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/vhost.h (97%) + rename tools/{ => perf/trace/beauty}/include/uapi/sound/asound.h (100%) + create mode 100755 tools/perf/trace/beauty/statx_mask.sh + create mode 100644 tools/perf/ui/browsers/annotate-data.c + create mode 100644 tools/perf/util/disasm.c + create mode 100644 tools/perf/util/disasm.h +Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) +$ 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 (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (0bb80ecc33a8 Linux 6.6-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 (5616fee8981b Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (7befe2ef9384 Merge branches 'for-next/acpi', 'for-next/kbuild', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/tlbi' 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 MAINTAINERS +Auto-merging arch/arm64/Makefile +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging include/linux/cpumask.h +Auto-merging scripts/Makefile.lib +Merge made by the 'ort' strategy. + Documentation/admin-guide/perf/hisi-pmu.rst | 1 - + Documentation/admin-guide/perf/hns3-pmu.rst | 8 +- + Documentation/admin-guide/perf/qcom_l2_pmu.rst | 2 +- + Documentation/admin-guide/perf/qcom_l3_pmu.rst | 2 +- + Documentation/admin-guide/perf/thunderx2-pmu.rst | 2 +- + Documentation/admin-guide/perf/xgene-pmu.rst | 2 +- + Documentation/process/changes.rst | 9 + + MAINTAINERS | 7 + + arch/arm64/Makefile | 11 +- + arch/arm64/boot/.gitignore | 1 + + arch/arm64/boot/Makefile | 6 +- + arch/arm64/include/asm/assembler.h | 7 +- + arch/arm64/include/asm/cputype.h | 2 + + arch/arm64/include/asm/el2_setup.h | 9 +- + arch/arm64/include/asm/irqflags.h | 1 - + arch/arm64/include/asm/pgtable.h | 9 +- + arch/arm64/include/asm/tlbflush.h | 33 ++- + arch/arm64/kernel/acpi.c | 10 + + arch/arm64/mm/mmu.c | 101 ++++---- + drivers/acpi/acpica/tbfadt.c | 30 +-- + drivers/acpi/acpica/tbutils.c | 7 +- + drivers/perf/alibaba_uncore_drw_pmu.c | 11 +- + drivers/perf/amlogic/meson_ddr_pmu_core.c | 1 + + drivers/perf/arm-cci.c | 1 + + drivers/perf/arm-ccn.c | 1 + + drivers/perf/arm-cmn.c | 11 +- + drivers/perf/arm_cspmu/arm_cspmu.c | 9 +- + drivers/perf/arm_dmc620_pmu.c | 1 + + drivers/perf/arm_dsu_pmu.c | 20 +- + drivers/perf/arm_pmu_platform.c | 1 + + drivers/perf/arm_smmuv3_pmu.c | 1 + + drivers/perf/arm_spe_pmu.c | 1 + + drivers/perf/dwc_pcie_pmu.c | 10 +- + drivers/perf/fsl_imx8_ddr_perf.c | 1 + + drivers/perf/hisilicon/hisi_pcie_pmu.c | 10 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 7 +- + drivers/perf/hisilicon/hns3_pmu.c | 1 + + drivers/perf/qcom_l2_pmu.c | 9 +- + drivers/perf/qcom_l3_pmu.c | 1 + + drivers/perf/riscv_pmu_legacy.c | 1 + + drivers/perf/riscv_pmu_sbi.c | 2 +- + drivers/perf/thunderx2_pmu.c | 30 +-- + drivers/perf/xgene_pmu.c | 1 + + include/linux/cpumask.h | 23 ++ + scripts/Makefile.lib | 16 ++ + scripts/make_fit.py | 290 +++++++++++++++++++++++ + 46 files changed, 549 insertions(+), 171 deletions(-) + create mode 100755 scripts/make_fit.py +Merging arm-perf/for-next/perf (4052ce07d5d7 perf/arm-spe: Assign parents for event_source device) +$ 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 (c23c2ae92027 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../access-controllers/access-controllers.yaml | 84 + + Documentation/devicetree/bindings/arm/fsl.yaml | 22 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 18 +- + .../devicetree/bindings/arm/rockchip.yaml | 43 +- + Documentation/devicetree/bindings/arm/sunxi.yaml | 25 + + .../devicetree/bindings/bus/st,stm32-etzpc.yaml | 96 + + .../bindings/bus/st,stm32mp25-rifsc.yaml | 105 + + .../devicetree/bindings/crypto/st,stm32-cryp.yaml | 4 + + .../devicetree/bindings/crypto/st,stm32-hash.yaml | 4 + + .../bindings/display/panel/panel-simple.yaml | 11 +- + .../display/tegra/nvidia,tegra20-host1x.yaml | 11 + + .../devicetree/bindings/dma/st,stm32-dma.yaml | 4 + + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 4 + + .../devicetree/bindings/firmware/arm,scmi.yaml | 54 +- + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 4 + + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 4 + + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 4 + + .../devicetree/bindings/iio/dac/st,stm32-dac.yaml | 4 + + .../bindings/media/cec/st,stm32-cec.yaml | 4 + + .../devicetree/bindings/media/st,stm32-dcmi.yaml | 4 + + .../bindings/media/st,stm32mp25-video-codec.yaml | 4 + + .../memory-controllers/samsung,s5pv210-dmc.yaml | 33 + + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 4 + + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 4 + + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 4 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 4 + + .../devicetree/bindings/net/can/bosch,m_can.yaml | 4 + + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 + + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 4 + + .../bindings/regulator/st,stm32-vrefbuf.yaml | 4 + + .../devicetree/bindings/rng/st,stm32-rng.yaml | 4 + + .../devicetree/bindings/serial/st,stm32-uart.yaml | 4 + + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 14 - + .../soc/renesas/renesas,r9a09g057-sys.yaml | 51 + + .../devicetree/bindings/soc/renesas/renesas.yaml | 8 + + .../devicetree/bindings/sound/st,stm32-i2s.yaml | 4 + + .../devicetree/bindings/sound/st,stm32-sai.yaml | 4 + + .../bindings/sound/st,stm32-spdifrx.yaml | 4 + + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 4 + + .../devicetree/bindings/spi/st,stm32-spi.yaml | 4 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 4 + + .../devicetree/bindings/usb/fsl,usbmisc.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + Documentation/tee/index.rst | 1 + + Documentation/tee/ts-tee.rst | 71 + + MAINTAINERS | 51 +- + arch/arm/arm-soc-for-next-contents.txt | 96 + + arch/arm/boot/dts/allwinner/Makefile | 1 + + .../allwinner/sun5i-a13-pocketbook-614-plus.dts | 218 ++ + arch/arm/boot/dts/allwinner/sun5i-a13.dtsi | 4 +- + arch/arm/boot/dts/allwinner/sun5i-gr8-chip-pro.dts | 2 +- + arch/arm/boot/dts/allwinner/sun5i-r8-chip.dts | 2 +- + .../boot/dts/allwinner/sun6i-a31-hummingbird.dts | 4 +- + arch/arm/boot/dts/allwinner/sun6i-a31.dtsi | 16 +- + .../dts/allwinner/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +- + .../dts/allwinner/sun7i-a20-bananapi-m1-plus.dts | 2 +- + .../boot/dts/allwinner/sun7i-a20-cubietruck.dts | 2 +- + .../boot/dts/allwinner/sun7i-a20-hummingbird.dts | 4 +- + .../allwinner/sun7i-a20-olimex-som-evb-emmc.dts | 2 +- + .../allwinner/sun7i-a20-olimex-som204-evb-emmc.dts | 2 +- + .../dts/allwinner/sun7i-a20-olimex-som204-evb.dts | 4 +- + .../dts/allwinner/sun7i-a20-olinuxino-lime2.dts | 2 +- + .../dts/allwinner/sun7i-a20-wits-pro-a20-dkt.dts | 2 +- + arch/arm/boot/dts/allwinner/sun7i-a20.dtsi | 4 +- + arch/arm/boot/dts/allwinner/sun8i-a23-a33.dtsi | 14 +- + .../allwinner/sun8i-a23-polaroid-mid2407pxe03.dts | 4 +- + .../allwinner/sun8i-a23-polaroid-mid2809pxe04.dts | 4 +- + .../boot/dts/allwinner/sun8i-a33-ga10h-v1.1.dts | 2 +- + .../dts/allwinner/sun8i-a33-inet-d978-rev2.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-a33.dtsi | 10 +- + .../boot/dts/allwinner/sun8i-a83t-bananapi-m3.dts | 2 +- + .../dts/allwinner/sun8i-a83t-cubietruck-plus.dts | 2 +- + .../arm/boot/dts/allwinner/sun8i-a83t-tbs-a711.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-a83t.dtsi | 8 +- + .../allwinner/sun8i-h2-plus-bananapi-m2-zero.dts | 2 +- + .../dts/allwinner/sun8i-h2-plus-orangepi-r1.dts | 5 +- + .../dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 6 +- + .../arm/boot/dts/allwinner/sun8i-h3-beelink-x2.dts | 4 +- + .../boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts | 4 +- + .../boot/dts/allwinner/sun8i-h3-nanopi-m1-plus.dts | 4 +- + .../boot/dts/allwinner/sun8i-h3-nanopi-neo-air.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-r1.dts | 2 +- + .../arm/boot/dts/allwinner/sun8i-h3-orangepi-2.dts | 4 +- + .../boot/dts/allwinner/sun8i-h3-orangepi-lite.dts | 2 +- + .../dts/allwinner/sun8i-h3-orangepi-pc-plus.dts | 2 +- + .../dts/allwinner/sun8i-h3-orangepi-zero-plus2.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-q8-common.dtsi | 4 +- + .../boot/dts/allwinner/sun8i-r16-bananapi-m2m.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-r16-parrot.dts | 2 +- + .../dts/allwinner/sun8i-r40-bananapi-m2-ultra.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-r40-oka40i-c.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi | 4 +- + .../dts/allwinner/sun8i-v40-bananapi-m2-berry.dts | 2 +- + arch/arm/boot/dts/allwinner/sun9i-a80.dtsi | 4 +- + .../boot/dts/allwinner/sunxi-bananapi-m2-plus.dtsi | 2 +- + .../dts/allwinner/sunxi-h3-h5-emlid-neutis.dtsi | 2 +- + arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi | 4 +- + .../dts/aspeed/aspeed-bmc-asrock-romed8hm3.dts | 4 +- + .../boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts | 2 +- + arch/arm/boot/dts/broadcom/bcm2711.dtsi | 4 +- + arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi | 4 +- + arch/arm/boot/dts/nvidia/tegra20-paz00.dts | 43 + + arch/arm/boot/dts/nxp/imx/Makefile | 3 + + arch/arm/boot/dts/nxp/imx/e60k02.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/e70k02.dtsi | 2 +- + .../dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi | 78 + + arch/arm/boot/dts/nxp/imx/imx51-ts4800.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx53-kp-ddc.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx53-kp.dtsi | 10 +- + arch/arm/boot/dts/nxp/imx/imx53-m53evk.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx53-mba53.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx53-ppd.dts | 6 +- + arch/arm/boot/dts/nxp/imx/imx53-tqma53.dtsi | 8 - + .../arm/boot/dts/nxp/imx/imx6dl-aristainetos_4.dts | 3 +- + .../arm/boot/dts/nxp/imx/imx6dl-aristainetos_7.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx6dl-mamoj.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx6q-ba16.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6q-bosch-acc.dts | 10 +- + arch/arm/boot/dts/nxp/imx/imx6q-kp.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6q-novena.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx6q-pistachio.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx6q-prti6q.dts | 3 +- + .../boot/dts/nxp/imx/imx6q-var-dt6customboard.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-apf6dev.dtsi | 3 +- + .../boot/dts/nxp/imx/imx6qdl-aristainetos2.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-cubox-i.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-emcon.dtsi | 9 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw52xx.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw53xx.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw54xx.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw560x.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5903.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5904.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi | 6 +- + .../boot/dts/nxp/imx/imx6qdl-nitrogen6_max.dtsi | 9 +- + .../boot/dts/nxp/imx/imx6qdl-nitrogen6_som2.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6x.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sabreauto.dtsi | 7 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sabrelite.dtsi | 9 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-savageboard.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi | 1 - + arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi | 25 +- + arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts | 4 +- + .../boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6sll.dtsi | 1 - + arch/arm/boot/dts/nxp/imx/imx6sx-nitrogen6sx.dts | 6 +- + arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi | 8 +- + .../dts/nxp/imx/imx6sx-softing-vining-2000.dts | 12 +- + arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 7 +- + arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 3 +- + .../arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsbcpro.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts | 3 +- + .../dts/nxp/imx/imx6ul-imx6ull-opos6uldev.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6ul-kontron-bl-43.dts | 3 +- + .../boot/dts/nxp/imx/imx6ul-kontron-bl-common.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6ul-pico.dtsi | 3 +- + .../nxp/imx/imx6ull-seeed-npi-dev-board-emmc.dts | 19 + + .../nxp/imx/imx6ull-seeed-npi-dev-board-nand.dts | 19 + + .../dts/nxp/imx/imx6ull-seeed-npi-dev-board.dtsi | 424 +++ + arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi.dtsi | 155 ++ + .../boot/dts/nxp/imx/imx6ull-tarragon-master.dts | 4 +- + .../boot/dts/nxp/imx/imx6ull-tarragon-slave.dts | 2 +- + .../boot/dts/nxp/imx/imx6ull-tarragon-slavext.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ull-uti260b.dts | 566 ++++ + arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 9 + + arch/arm/boot/dts/qcom/Makefile | 3 + + arch/arm/boot/dts/qcom/msm8226-motorola-falcon.dts | 359 +++ + arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 12 +- + arch/arm/boot/dts/qcom/qcom-apq8084.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 45 +- + arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 30 + + arch/arm/boot/dts/qcom/qcom-msm8916-smp.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 6 +- + .../qcom/qcom-msm8974pro-samsung-klte-common.dtsi | 818 ++++++ + .../boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts | 813 +----- + .../dts/qcom/qcom-msm8974pro-samsung-kltechn.dts | 16 + + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 576 +---- + ...qcom-msm8974pro-sony-xperia-shinano-common.dtsi | 539 ++++ + .../qcom-msm8974pro-sony-xperia-shinano-leo.dts | 44 + + arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 10 + + arch/arm/boot/dts/renesas/r7s72100.dtsi | 8 + + arch/arm/boot/dts/renesas/r8a73a4.dtsi | 37 + + arch/arm/boot/dts/renesas/r8a7742.dtsi | 58 + + arch/arm/boot/dts/renesas/r8a7743.dtsi | 58 + + arch/arm/boot/dts/renesas/r8a7744.dtsi | 58 + + arch/arm/boot/dts/renesas/r8a7745.dtsi | 58 + + arch/arm/boot/dts/renesas/r8a77470.dtsi | 44 + + arch/arm/boot/dts/renesas/r8a7790.dtsi | 58 + + arch/arm/boot/dts/renesas/r8a7791.dtsi | 58 + + arch/arm/boot/dts/renesas/r8a7792.dtsi | 59 + + arch/arm/boot/dts/renesas/r8a7793.dtsi | 58 + + arch/arm/boot/dts/renesas/r8a7794.dtsi | 58 + + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 1 - + arch/arm/boot/dts/samsung/exynos3250.dtsi | 2 + + arch/arm/boot/dts/samsung/exynos4.dtsi | 3 + + arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts | 2 +- + arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 6 + + arch/arm/boot/dts/samsung/exynos4412-origen.dts | 2 +- + arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts | 12 +- + arch/arm/boot/dts/samsung/exynos5250.dtsi | 3 + + arch/arm/boot/dts/samsung/exynos5420.dtsi | 3 + + arch/arm/boot/dts/samsung/exynos5800-peach-pi.dts | 2 +- + arch/arm/boot/dts/samsung/s5pv210.dtsi | 6 +- + arch/arm/boot/dts/st/stm32f746.dtsi | 17 - + arch/arm/boot/dts/st/stm32f769.dtsi | 17 + + arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi | 57 + + arch/arm/boot/dts/st/stm32mp131.dtsi | 1088 ++++---- + arch/arm/boot/dts/st/stm32mp133.dtsi | 51 +- + arch/arm/boot/dts/st/stm32mp135.dtsi | 11 + + arch/arm/boot/dts/st/stm32mp135f-dk.dts | 53 + + arch/arm/boot/dts/st/stm32mp13xc.dtsi | 19 +- + arch/arm/boot/dts/st/stm32mp13xf.dtsi | 19 +- + arch/arm/boot/dts/st/stm32mp151.dtsi | 2726 ++++++++++---------- + arch/arm/boot/dts/st/stm32mp153.dtsi | 52 +- + arch/arm/boot/dts/st/stm32mp157c-ed1.dts | 12 + + arch/arm/boot/dts/st/stm32mp15xc.dtsi | 19 +- + arch/arm/boot/dts/ti/omap/am33xx.dtsi | 8 +- + arch/arm/boot/dts/ti/omap/am4372.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/dra76x.dtsi | 63 +- + arch/arm/boot/dts/ti/omap/dra7xx-clocks.dtsi | 270 +- + arch/arm/boot/dts/ti/omap/omap3-n900.dts | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/mach-imx/mmdc.c | 1 + + arch/arm/mach-stm32/Kconfig | 1 + + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 4 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 16 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 18 +- + .../boot/dts/allwinner/sun50i-h313-tanix-tx1.dts | 183 ++ + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 2 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 4 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 2 +- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 2 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 2 +- + .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 +- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 6 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 11 +- + .../allwinner/sun50i-h618-transpeed-8k618-t.dts | 2 +- + .../dts/allwinner/sun50i-h64-remix-mini-pc.dts | 2 +- + .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 327 +++ + .../allwinner/sun50i-h700-anbernic-rg35xx-h.dts | 36 + + .../allwinner/sun50i-h700-anbernic-rg35xx-plus.dts | 53 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 2 +- + arch/arm64/boot/dts/amazon/alpine-v2.dtsi | 35 +- + arch/arm64/boot/dts/amazon/alpine-v3.dtsi | 12 +- + arch/arm64/boot/dts/amd/elba-16core.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba-asic-common.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba-asic.dts | 2 +- + arch/arm64/boot/dts/amd/elba-flash-parts.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba.dtsi | 2 +- + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 14 +- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 15 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 4 +- + arch/arm64/boot/dts/arm/juno-scmi.dtsi | 4 +- + .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 2 +- + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- + arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 22 +- + arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 3 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 5 + + arch/arm64/boot/dts/exynos/exynos850.dtsi | 26 + + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 12 + + arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 4 +- + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 791 +++++- + arch/arm64/boot/dts/freescale/Makefile | 7 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +- + .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 2 +- + .../freescale/fsl-ls1028a-kontron-sl28-var3.dts | 18 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 20 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 7 + + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 7 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 5 - + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 108 +- + .../boot/dts/freescale/fsl-lx2162a-clearfog.dts | 1 + + .../boot/dts/freescale/fsl-lx2162a-sr-som.dtsi | 9 + + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 285 +- + arch/arm64/boot/dts/freescale/imx8-ss-cm40.dtsi | 91 + + arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi | 2 - + .../boot/dts/freescale/imx8dx-colibri-aster.dts | 16 + + .../boot/dts/freescale/imx8dx-colibri-eval-v3.dts | 16 + + .../boot/dts/freescale/imx8dx-colibri-iris-v2.dts | 16 + + .../boot/dts/freescale/imx8dx-colibri-iris.dts | 16 + + arch/arm64/boot/dts/freescale/imx8dx-colibri.dtsi | 11 + + arch/arm64/boot/dts/freescale/imx8dx.dtsi | 13 + + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 37 + + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 19 +- + .../boot/dts/freescale/imx8mm-var-som-symphony.dts | 1 - + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 2 +- + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 40 +- + .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 7 +- + .../boot/dts/freescale/imx8mm-verdin-yavia.dtsi | 5 + + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 26 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 9 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr3l-evk.dts | 16 + + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 16 + + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 16 + + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 45 +- + .../boot/dts/freescale/imx8mn-var-som-symphony.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 8 +- + .../arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 2 +- + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 2 - + .../dts/freescale/imx8mp-debix-som-a-bmb-08.dts | 1 - + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts | 10 + + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 45 + + arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s.dtsi | 46 +- + arch/arm64/boot/dts/freescale/imx8mp-navqp.dts | 424 +++ + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 38 + + .../boot/dts/freescale/imx8mp-venice-gw71xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mp-venice-gw72xx.dtsi | 36 + + .../boot/dts/freescale/imx8mp-venice-gw73xx.dtsi | 36 + + .../dts/freescale/imx8mp-venice-gw74xx-imx219.dtso | 13 + + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 6 + + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 56 +- + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 12 +- + .../boot/dts/freescale/imx8mp-verdin-mallow.dtsi | 5 + + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 10 + + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 53 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 168 +- + .../dts/freescale/imx8mq-hummingboard-pulse.dts | 2 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 7 + + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 86 + + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 140 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 84 + + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 94 + + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 397 ++- + arch/arm64/boot/dts/freescale/imx93.dtsi | 140 +- + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 14 +- + arch/arm64/boot/dts/freescale/s32g2.dtsi | 37 +- + arch/arm64/boot/dts/freescale/s32g274a-evb.dts | 6 +- + arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts | 6 +- + arch/arm64/boot/dts/freescale/s32g3.dtsi | 233 ++ + arch/arm64/boot/dts/freescale/s32g399a-rdb3.dts | 45 + + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 43 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 4 +- + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 12 +- + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 88 +- + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 84 +- + arch/arm64/boot/dts/intel/keembay-soc.dtsi | 2 +- + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 2 +- + arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 2 +- + arch/arm64/boot/dts/microchip/sparx5.dtsi | 4 +- + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 149 +- + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 35 +- + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 16 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 12 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 10 + + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 41 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 2 +- + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 6 + + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 6 + + .../dts/qcom/msm8916-samsung-fortuna-common.dtsi | 83 + + .../dts/qcom/msm8916-samsung-rossa-common.dtsi | 12 + + arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 6 + + arch/arm64/boot/dts/qcom/msm8953.dtsi | 14 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 30 + + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 67 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 10 + + arch/arm64/boot/dts/qcom/pm6150.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 10 + + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 58 +- + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 2 + + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 189 ++ + arch/arm64/boot/dts/qcom/qcs404.dtsi | 10 + + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 251 +- + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 61 +- + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 1 + + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 2 +- + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 20 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 + + arch/arm64/boot/dts/qcom/sc7180.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 24 + + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 59 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 53 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 22 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 105 +- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 9 + + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 31 +- + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 64 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 6 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 20 + + arch/arm64/boot/dts/qcom/sdx75.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 119 + + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 16 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 20 + + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 11 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 30 + + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 1 + + arch/arm64/boot/dts/qcom/sm8350.dtsi | 26 + + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 1 + + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 8 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 23 + + .../dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 779 ++++++ + arch/arm64/boot/dts/qcom/sm8550.dtsi | 42 +- + arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 4 - + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 12 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 255 +- + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 47 +- + arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 51 + + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 27 +- + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 46 +- + arch/arm64/boot/dts/realtek/rtd129x.dtsi | 2 +- + arch/arm64/boot/dts/realtek/rtd139x.dtsi | 2 +- + arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 4 +- + arch/arm64/boot/dts/renesas/Makefile | 3 + + .../renesas/r8a77970-eagle-function-expansion.dtso | 214 ++ + arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts | 6 +- + .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 27 +- + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 537 +++- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 4 - + arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 58 + + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/Makefile | 6 + + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 56 + + .../boot/dts/rockchip/rk3326-gameforce-chi.dts | 809 ++++++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 37 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +- + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 2 +- + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353ps.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353vs.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 5 + + .../boot/dts/rockchip/rk3566-powkiddy-rgb30.dts | 2 +- + .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dts | 2 +- + .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dtsi | 2 + + .../boot/dts/rockchip/rk3566-powkiddy-x55.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 +- + .../boot/dts/rockchip/rk3566-soquartz-blade.dts | 2 +- + .../boot/dts/rockchip/rk3566-soquartz-cm4.dts | 2 +- + .../boot/dts/rockchip/rk3566-soquartz-model-a.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-mecsbc.dts | 404 +++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 2 +- + .../rk3568-wolfvision-pf5-io-expander.dtso | 137 + + .../boot/dts/rockchip/rk3568-wolfvision-pf5.dts | 528 ++++ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 41 + + .../boot/dts/rockchip/rk3588-armsom-sige7.dts | 721 ++++++ + .../arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 7 +- + .../dts/rockchip/rk3588-edgeble-neu6a-common.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 161 ++ + arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi | 558 ++++ + arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 66 +- + arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts | 409 +++ + .../arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 16 +- + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 24 +- + .../boot/dts/rockchip/rk3588-tiger-haikou.dts | 65 +- + arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 29 +- + .../arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3588.dtsi | 72 + + arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 7 +- + .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 73 +- + .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 680 +++++ + .../arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 22 +- + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 353 ++- + .../boot/dts/socionext/uniphier-ld11-global.dts | 4 +- + .../boot/dts/socionext/uniphier-ld20-global.dts | 4 +- + arch/arm64/boot/dts/sprd/sc9860.dtsi | 58 +- + arch/arm64/boot/dts/sprd/sc9863a.dtsi | 2 +- + arch/arm64/boot/dts/sprd/sharkl3.dtsi | 18 +- + arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 30 +- + arch/arm64/boot/dts/sprd/whale2.dtsi | 2 +- + arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 82 + + arch/arm64/boot/dts/st/stm32mp251.dtsi | 359 ++- + arch/arm64/boot/dts/st/stm32mp253.dtsi | 7 + + arch/arm64/boot/dts/st/stm32mp255.dtsi | 33 +- + arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 34 + + arch/arm64/boot/dts/synaptics/berlin4ct.dtsi | 2 +- + arch/arm64/boot/dts/tesla/fsd.dtsi | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 +- + arch/arm64/configs/defconfig | 13 + + arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 75 + + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 16 - + drivers/bus/Kconfig | 10 + + drivers/bus/Makefile | 1 + + drivers/bus/stm32_etzpc.c | 141 + + drivers/bus/stm32_firewall.c | 294 +++ + drivers/bus/stm32_firewall.h | 83 + + drivers/bus/stm32_rifsc.c | 252 ++ + drivers/bus/ti-sysc.c | 165 +- + drivers/firmware/arm_ffa/driver.c | 187 +- + drivers/firmware/arm_scmi/Makefile | 3 +- + drivers/firmware/arm_scmi/common.h | 11 + + drivers/firmware/arm_scmi/driver.c | 269 +- + drivers/firmware/arm_scmi/mailbox.c | 3 + + drivers/firmware/arm_scmi/notify.c | 30 +- + drivers/firmware/arm_scmi/perf.c | 15 +- + drivers/firmware/arm_scmi/pinctrl.c | 916 +++++++ + drivers/firmware/arm_scmi/protocols.h | 18 + + drivers/firmware/qcom/qcom_scm.c | 79 +- + drivers/memory/brcmstb_memc.c | 1 + + drivers/memory/mtk-smi.c | 2 + + drivers/of/property.c | 2 + + drivers/pinctrl/Kconfig | 11 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-scmi.c | 571 ++++ + drivers/soc/hisilicon/Kconfig | 2 +- + drivers/soc/hisilicon/kunpeng_hccs.c | 6 + + drivers/soc/mediatek/mtk-cmdq-helper.c | 163 +- + drivers/soc/mediatek/mtk-mutex.c | 41 + + drivers/soc/mediatek/mtk-socinfo.c | 14 +- + drivers/soc/qcom/cmd-db.c | 41 +- + drivers/soc/qcom/icc-bwmon.c | 8 +- + drivers/soc/qcom/pmic_glink.c | 9 + + drivers/soc/qcom/pmic_pdcharger_ulog.c | 4 + + drivers/soc/qcom/qcom_stats.c | 4 + + drivers/soc/qcom/rpm_master_stats.c | 4 + + drivers/soc/qcom/rpmh-rsc.c | 5 +- + drivers/soc/qcom/socinfo.c | 2 + + drivers/soc/renesas/Kconfig | 6 + + drivers/soc/renesas/renesas-soc.c | 20 +- + drivers/soc/tegra/pmc.c | 2 + + drivers/tee/Kconfig | 1 + + drivers/tee/Makefile | 1 + + drivers/tee/amdtee/amdtee_private.h | 2 +- + drivers/tee/amdtee/call.c | 2 +- + drivers/tee/amdtee/core.c | 3 +- + drivers/tee/amdtee/shm_pool.c | 2 +- + drivers/tee/optee/call.c | 2 +- + drivers/tee/optee/core.c | 66 +- + drivers/tee/optee/device.c | 2 +- + drivers/tee/optee/ffa_abi.c | 8 +- + drivers/tee/optee/notif.c | 2 +- + drivers/tee/optee/optee_private.h | 14 +- + drivers/tee/optee/rpc.c | 2 +- + drivers/tee/optee/smc_abi.c | 17 +- + drivers/tee/tee_core.c | 2 +- + drivers/tee/tee_private.h | 35 - + drivers/tee/tee_shm.c | 67 +- + drivers/tee/tee_shm_pool.c | 2 +- + drivers/tee/tstee/Kconfig | 11 + + drivers/tee/tstee/Makefile | 3 + + drivers/tee/tstee/core.c | 480 ++++ + drivers/tee/tstee/tstee_private.h | 92 + + include/dt-bindings/arm/qcom,ids.h | 1 + + include/dt-bindings/clock/r8a73a4-clock.h | 4 + + include/linux/arm_ffa.h | 27 + + include/linux/bus/stm32_firewall_device.h | 142 + + include/linux/platform_data/ti-sysc.h | 1 - + include/linux/scmi_protocol.h | 86 +- + include/linux/soc/mediatek/mtk-cmdq.h | 153 +- + include/linux/tee_core.h | 306 +++ + include/linux/tee_drv.h | 317 +-- + include/soc/qcom/cmd-db.h | 10 +- + include/trace/events/scmi.h | 6 +- + include/uapi/linux/tee.h | 1 + + 587 files changed, 26232 insertions(+), 5447 deletions(-) + create mode 100644 Documentation/devicetree/bindings/access-controllers/access-controllers.yaml + create mode 100644 Documentation/devicetree/bindings/bus/st,stm32-etzpc.yaml + create mode 100644 Documentation/devicetree/bindings/bus/st,stm32mp25-rifsc.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/samsung,s5pv210-dmc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/renesas/renesas,r9a09g057-sys.yaml + create mode 100644 Documentation/tee/ts-tee.rst + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi-dev-board-emmc.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi-dev-board-nand.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi-dev-board.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-uti260b.dts + create mode 100644 arch/arm/boot/dts/qcom/msm8226-motorola-falcon.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-kltechn.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-common.dtsi + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-leo.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h313-tanix-tx1.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-2024.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-h.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-plus.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28-var3.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-cm40.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8dx-colibri-aster.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8dx-colibri-eval-v3.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8dx-colibri-iris-v2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8dx-colibri-iris.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8dx-colibri.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8dx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-navqp.dts + create mode 100644 arch/arm64/boot/dts/freescale/s32g3.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/s32g399a-rdb3.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77970-eagle-function-expansion.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-gameforce-chi.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-mecsbc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts + create mode 100644 drivers/bus/stm32_etzpc.c + create mode 100644 drivers/bus/stm32_firewall.c + create mode 100644 drivers/bus/stm32_firewall.h + create mode 100644 drivers/bus/stm32_rifsc.c + create mode 100644 drivers/firmware/arm_scmi/pinctrl.c + create mode 100644 drivers/pinctrl/pinctrl-scmi.c + create mode 100644 drivers/tee/tstee/Kconfig + create mode 100644 drivers/tee/tstee/Makefile + create mode 100644 drivers/tee/tstee/core.c + create mode 100644 drivers/tee/tstee/tstee_private.h + create mode 100644 include/linux/bus/stm32_firewall_device.h + create mode 100644 include/linux/tee_core.h +Merging amlogic/for-next (2b952b1d0a54 Merge branch 'v6.10/defconfig' 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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 13 + + .../bindings/serial/amlogic,meson-uart.yaml | 4 +- + arch/arm64/boot/dts/amlogic/Makefile | 7 + + .../boot/dts/amlogic/amlogic-a4-a113l2-ba400.dts | 42 +++ + arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi | 66 ++++ + arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 40 +++ + .../boot/dts/amlogic/amlogic-a5-a113x2-av400.dts | 42 +++ + arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 40 +++ + arch/arm64/boot/dts/amlogic/amlogic-t7-reset.h | 197 +++++++++++ + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 7 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 70 ++++ + .../meson-g12b-bananapi-cm4-mnt-reform2.dts | 384 +++++++++++++++++++++ + .../boot/dts/amlogic/meson-khadas-vim3-ts050.dtso | 108 ++++++ + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13 +- + arch/arm64/configs/defconfig | 1 + + 15 files changed, 1029 insertions(+), 5 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a4-a113l2-ba400.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a5-a113x2-av400.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-t7-reset.h + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-khadas-vim3-ts050.dtso +Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/aspeed/aspeed-g6.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 6 + + arch/arm/boot/dts/aspeed/Makefile | 8 +- + .../dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts | 322 ++++ + .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 324 ++++ + .../boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 377 +++++ + arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts | 592 +++++++ + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 620 ++++++++ + .../dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts | 265 ---- + .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 543 +++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 1623 ++++++++++++++++++++ + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 + + arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi | 2 + + 12 files changed, 4420 insertions(+), 266 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts + delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' 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 'ort' strategy. +Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging arch/arm/boot/dts/broadcom/bcm2711.dtsi +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 2 + + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 30 ++++ + .../bindings/gpio/raspberrypi,firmware-gpio.txt | 30 ---- + arch/arm/boot/dts/broadcom/Makefile | 2 + + arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts | 29 ++++ + arch/arm/boot/dts/broadcom/bcm2711-rpi-400.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts | 33 +++++ + arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi | 34 ++++- + arch/arm/boot/dts/broadcom/bcm2711.dtsi | 8 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-common.dtsi | 7 - + arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 23 ++- + arch/arm/boot/dts/broadcom/bcm283x.dtsi | 24 +++ + .../boot/dts/broadcom/bcm4709-asus-rt-ac3200.dts | 150 +++++++++++++++++++ + .../boot/dts/broadcom/bcm47094-asus-rt-ac3100.dts | 13 +- + .../boot/dts/broadcom/bcm47094-asus-rt-ac3100.dtsi | 161 +++++++++++---------- + .../boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts | 156 ++++++++++++++++++++ + .../boot/dts/broadcom/bcm47094-asus-rt-ac88u.dts | 69 +++++---- + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 1 - + arch/arm64/configs/defconfig | 1 + + drivers/bus/brcmstb_gisb.c | 1 + + drivers/firmware/raspberrypi.c | 7 +- + 22 files changed, 622 insertions(+), 161 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/raspberrypi,firmware-gpio.txt + create mode 100644 arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac3200.dts + create mode 100644 arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts +Merging davinci/davinci/for-next (6613476e225e Linux 6.8-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 (bf11908757ee memory: mtk-smi: fix module autoloading) +$ 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 +Already up to date. +Merging imx-mxs/for-next (8c4bf8c96748 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 +Merge made by the 'ort' strategy. +Merging mediatek/for-next (7f6f45a762c3 Merge branches 'v6.9-next/soc' and 'v6.9-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8183.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8192.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8195.dtsi +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/airoha.yaml | 4 + + .../devicetree/bindings/arm/mediatek.yaml | 15 + + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/Kconfig.platforms | 7 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/airoha/Makefile | 2 + + arch/arm64/boot/dts/airoha/en7581-evb.dts | 26 + + arch/arm64/boot/dts/airoha/en7581.dtsi | 163 +++ + arch/arm64/boot/dts/mediatek/Makefile | 4 + + .../boot/dts/mediatek/mt7981b-cudy-wr3000-v1.dts | 74 ++ + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 48 +- + arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 32 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 6 - + .../dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 1 + + .../mt8183-kukui-jacuzzi-fennel14-sku2.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 3 +- + .../mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts | 1 + + .../dts/mediatek/mt8183-kukui-kodama-sku32.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 8 - + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 6 - + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 136 ++- + arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 42 +- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 19 + + arch/arm64/boot/dts/mediatek/mt8188.dtsi | 35 + + .../boot/dts/mediatek/mt8192-asurada-hayato-r1.dts | 1 + + .../dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts | 1 + + .../dts/mediatek/mt8192-asurada-spherion-r0.dts | 1 + + .../dts/mediatek/mt8192-asurada-spherion-r4.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 2 +- + .../boot/dts/mediatek/mt8195-cherry-dojo-r1.dts | 114 ++ + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 50 + + arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 4 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 +- + .../boot/dts/mediatek/mt8390-genio-700-evk.dts | 880 +++++++++++++++ + .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 6 + + .../dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 1127 ++++++++++++++++++++ + .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 88 +- + arch/arm64/configs/defconfig | 1 + + 46 files changed, 2853 insertions(+), 70 deletions(-) + create mode 100644 arch/arm64/boot/dts/airoha/Makefile + create mode 100644 arch/arm64/boot/dts/airoha/en7581-evb.dts + create mode 100644 arch/arm64/boot/dts/airoha/en7581.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt7981b-cudy-wr3000-v1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-cherry-dojo-r1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts +Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status") +$ 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 'ort' strategy. + arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 2 +- + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 13 ++++++------- + arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 18 ++++++++---------- + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 8 +++----- + arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 12 ++++++------ + 5 files changed, 24 insertions(+), 29 deletions(-) +Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' 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 +Merge made by the 'ort' strategy. +Merging qcom/for-next (99376e9b6f12 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/qcom,hfpll.txt | 63 -------- + .../devicetree/bindings/clock/qcom,hfpll.yaml | 69 +++++++++ + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30 ++-- + drivers/clk/qcom/Kconfig | 2 + + drivers/clk/qcom/apss-ipq-pll.c | 79 +++++----- + drivers/clk/qcom/clk-alpha-pll.c | 24 ++- + drivers/clk/qcom/clk-alpha-pll.h | 5 +- + drivers/clk/qcom/clk-cbf-8996.c | 13 +- + drivers/clk/qcom/clk-rcg.h | 24 ++- + drivers/clk/qcom/clk-rcg2.c | 166 +++++++++++++++++++++ + drivers/clk/qcom/clk-rpm.c | 1 - + drivers/clk/qcom/common.c | 18 +++ + drivers/clk/qcom/common.h | 2 + + drivers/clk/qcom/dispcc-sm6350.c | 11 +- + drivers/clk/qcom/dispcc-sm8450.c | 20 +-- + drivers/clk/qcom/dispcc-sm8550.c | 20 +-- + drivers/clk/qcom/dispcc-sm8650.c | 20 +-- + drivers/clk/qcom/gcc-ipq8074.c | 120 +++++++++------ + drivers/clk/qcom/gcc-msm8917.c | 1 + + drivers/clk/qcom/gcc-msm8953.c | 1 + + drivers/clk/qcom/gcc-sm8150.c | 61 -------- + drivers/clk/qcom/gcc-sm8450.c | 2 +- + drivers/clk/qcom/hfpll.c | 6 +- + drivers/clk/qcom/mmcc-msm8998.c | 8 + + 24 files changed, 461 insertions(+), 305 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,hfpll.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,hfpll.yaml +Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' 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 arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm/configs/shmobile_defconfig | 3 ++- + arch/arm64/configs/defconfig | 6 ++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) +Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + drivers/reset/reset-meson-audio-arb.c | 6 ++---- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 6 ++---- + drivers/reset/reset-ti-sci.c | 6 ++---- + 3 files changed, 6 insertions(+), 12 deletions(-) +Merging rockchip/for-next (8dabf52bd8db Merge branch 'v6.10-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 'ort' strategy. + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../rockchip/rk3568-wolfvision-pf5-display-vz.dtso | 17 +++ + .../rockchip/rk3568-wolfvision-pf5-display.dtsi | 121 +++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3568.c | 4 + + drivers/clk/rockchip/rst-rk3588.c | 1 + + include/dt-bindings/clock/rk3568-cru.h | 1 + + include/dt-bindings/reset/rockchip,rk3588-cru.h | 2 + + 7 files changed, 147 insertions(+) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display-vz.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display.dtsi +Merging samsung-krzk/for-next (87e058864108 Merge branch 'fixes' 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 'ort' strategy. + .../bindings/clock/google,gs101-clock.yaml | 55 +- + .../bindings/clock/samsung,s3c6400-clock.yaml | 57 + + .../bindings/clock/samsung,s3c64xx-clock.txt | 76 -- + .../soc/samsung/samsung,exynos-sysreg.yaml | 2 + + arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 24 + + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 67 ++ + drivers/clk/samsung/clk-exynos-arm64.c | 56 +- + drivers/clk/samsung/clk-exynos850.c | 440 ++++++- + drivers/clk/samsung/clk-exynosautov9.c | 8 +- + drivers/clk/samsung/clk-gs101.c | 1201 ++++++++++++++++++-- + drivers/clk/samsung/clk.h | 15 +- + include/dt-bindings/clock/google,gs101.h | 116 ++ + 12 files changed, 1912 insertions(+), 205 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c6400-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c64xx-clock.txt +Merging scmi/for-linux-next (146928437fcb Merge tags 'scmi-updates-6.10' and 'ffa-updates-6.10' 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 'ort' strategy. +Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts | 20 +++- + arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 9 ++ + arch/riscv/boot/dts/sophgo/cv1812h.dtsi | 4 + + arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 132 ++++++++++++++++++++++- + 4 files changed, 157 insertions(+), 8 deletions(-) +Merging stm32/stm32-next (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25) + 0087ca056c73 ("arm64: dts: st: add all 8 i2c nodes on stm32mp251") + 2886ab7437de ("arm64: dts: st: add rcc support for STM32MP25") + 385ca8e3841f ("arm64: dts: st: add spi3 / spi8 properties on stm32mp257f-ev1") + 3e7d579c9fca ("ARM: dts: stm32: add ETZPC as a system bus for STM32MP15x boards") + 4ef09379d765 ("arm64: dts: st: add i2c2 / i2c8 properties on stm32mp257f-ev1") + 5e6b388d7bcb ("ARM: dts: stm32: move can3 node from stm32f746 to stm32f769") + 7442597f90ba ("arm64: dts: st: add i2c2/i2c8 pins for stm32mp25") + 7c12d95564a2 ("ARM: dts: stm32: add LTDC pinctrl on STM32MP13x SoC family") + 7c3d4f99a920 ("ARM: dts: stm32: put ETZPC as an access controller for STM32MP15x boards") + 808691f7389d ("media: dt-bindings: add access-controllers to STM32MP25 video codecs") + 881bccce217e ("ARM: dts: stm32: add LTDC support for STM32MP13x SoC family") + 8fe31699b83d ("bus: stm32_firewall: fix off by one in stm32_firewall_get_firewall()") + 9e716b41a2b5 ("arm64: dts: st: add RIFSC as an access controller for STM32MP25x boards") + a012bd75abf6 ("ARM: dts: stm32: enable display support on stm32mp135f-dk board") + aee0ce48516c ("arm64: dts: st: add spi3/spi8 pins for stm32mp25") + be62e9c0c3fc ("bus: etzpc: introduce ETZPC firewall controller driver") + c7f2f2c0ace8 ("ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1") + cab43766e000 ("ARM: dts: stm32: add ETZPC as a system bus for STM32MP13x boards") + d3740a9fd78c ("dt-bindings: display: simple: allow panel-common properties") + dccdbccb7045 ("arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25") + de9b447d5678 ("ARM: dts: stm32: put ETZPC as an access controller for STM32MP13x boards") + ede58756bbe5 ("arm64: dts: st: add all 8 spi nodes on stm32mp251") + f798f7079233 ("ARM: dts: stm32: add PWR regulators support on stm32mp131") +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' 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 +Merge made by the 'ort' strategy. + drivers/clk/sunxi-ng/ccu-sun20i-d1-r.c | 1 + + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 1 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 15 ++++++++++----- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 20 ++++++++++++++++++-- + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 1 + + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 1 + + drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 1 + + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 1 + + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 1 + + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 1 + + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 1 + + drivers/clk/sunxi-ng/ccu_common.c | 19 +++++++++++++++++++ + drivers/clk/sunxi-ng/ccu_common.h | 3 +++ + drivers/clk/sunxi-ng/ccu_nkm.c | 21 +++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu_nkm.h | 2 ++ + 27 files changed, 94 insertions(+), 7 deletions(-) +Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (2fd759c1796c Merge branch for-6.10/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 +Merge made by the 'ort' strategy. +Merging ti/ti-next (9cedf91ec112 Merge branch '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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/keystone/ti,sci.yaml | 5 - + arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi | 5 - + arch/arm64/boot/dts/ti/Makefile | 5 + + arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 1 - + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 10 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 32 +++++- + arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-mallow.dtsi | 22 +++- + arch/arm64/boot/dts/ti/k3-am62-verdin-yavia.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 47 ++++++-- + arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 10 ++ + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 35 +++--- + .../boot/dts/ti/k3-am625-phyboard-lyra-rdk.dts | 127 ++++++++++++++++++++- + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 23 +++- + arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi | 10 ++ + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 21 ++++ + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 55 +++++++++ + arch/arm64/boot/dts/ti/k3-am62p-wakeup.dtsi | 10 ++ + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 72 +++++++++++- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 1 - + .../dts/ti/k3-am642-phyboard-electra-gpio-fan.dtso | 50 ++++++++ + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 6 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 - + .../boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi | 32 +++++- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 56 ++++----- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 7 +- + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 1 - + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 12 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 10 -- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 10 -- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 10 +- + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 12 -- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 2 - + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 13 ++- + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 8 +- + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 12 -- + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 1 + + drivers/firmware/ti_sci.c | 24 +--- + drivers/soc/ti/wkup_m3_ipc.c | 7 +- + 42 files changed, 602 insertions(+), 197 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-gpio-fan.dtso +Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' 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 'ort' strategy. +Merging clk/clk-next (92e92dc84e17 Merge branch 'clk-scmi' 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 +Merge made by the 'ort' strategy. + .../bindings/clock/airoha,en7523-scu.yaml | 31 +- + .../bindings/clock/loongson,ls2k-clk.yaml | 4 +- + .../bindings/clock/sophgo,cv1800-clk.yaml | 3 +- + .../bindings/clock/st,stm32mp25-rcc.yaml | 170 +- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-en7523.c | 191 +- + drivers/clk/clk-gemini.c | 2 - + drivers/clk/clk-highbank.c | 1 - + drivers/clk/clk-loongson2.c | 584 +++--- + drivers/clk/clk-renesas-pcie.c | 10 +- + drivers/clk/clk-scmi.c | 249 ++- + drivers/clk/mediatek/clk-mt8365-mm.c | 2 +- + drivers/clk/mediatek/clk-pllfh.c | 2 +- + drivers/clk/nxp/clk-lpc18xx-cgu.c | 1 - + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 14 + + drivers/clk/renesas/r9a07g043-cpg.c | 4 +- + drivers/clk/renesas/r9a07g044-cpg.c | 2 +- + drivers/clk/sophgo/Kconfig | 11 + + drivers/clk/sophgo/Makefile | 7 + + drivers/clk/sophgo/clk-cv1800.c | 1537 ++++++++++++++++ + drivers/clk/sophgo/clk-cv1800.h | 123 ++ + drivers/clk/sophgo/clk-cv18xx-common.c | 66 + + drivers/clk/sophgo/clk-cv18xx-common.h | 81 + + drivers/clk/sophgo/clk-cv18xx-ip.c | 887 +++++++++ + drivers/clk/sophgo/clk-cv18xx-ip.h | 261 +++ + drivers/clk/sophgo/clk-cv18xx-pll.c | 419 +++++ + drivers/clk/sophgo/clk-cv18xx-pll.h | 118 ++ + drivers/clk/stm32/Kconfig | 7 + + drivers/clk/stm32/Makefile | 1 + + drivers/clk/stm32/clk-stm32-core.c | 11 +- + drivers/clk/stm32/clk-stm32mp13.c | 72 +- + drivers/clk/stm32/clk-stm32mp25.c | 1875 ++++++++++++++++++++ + drivers/clk/stm32/reset-stm32.c | 59 +- + drivers/clk/stm32/reset-stm32.h | 7 + + drivers/clk/stm32/stm32mp25_rcc.h | 712 ++++++++ + drivers/clk/ti/dpll.c | 10 +- + include/dt-bindings/clock/loongson,ls2k-clk.h | 54 +- + include/dt-bindings/clock/r9a07g043-cpg.h | 6 +- + include/dt-bindings/reset/st,stm32mp25-rcc.h | 2 +- + 40 files changed, 7107 insertions(+), 491 deletions(-) + create mode 100644 drivers/clk/sophgo/Kconfig + create mode 100644 drivers/clk/sophgo/Makefile + create mode 100644 drivers/clk/sophgo/clk-cv1800.c + create mode 100644 drivers/clk/sophgo/clk-cv1800.h + create mode 100644 drivers/clk/sophgo/clk-cv18xx-common.c + create mode 100644 drivers/clk/sophgo/clk-cv18xx-common.h + create mode 100644 drivers/clk/sophgo/clk-cv18xx-ip.c + create mode 100644 drivers/clk/sophgo/clk-cv18xx-ip.h + create mode 100644 drivers/clk/sophgo/clk-cv18xx-pll.c + create mode 100644 drivers/clk/sophgo/clk-cv18xx-pll.h + create mode 100644 drivers/clk/stm32/clk-stm32mp25.c + create mode 100644 drivers/clk/stm32/stm32mp25_rcc.h +Merging clk-imx/for-next (5224b189462f clk: imx: add i.MX95 BLK CTL clk driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + .../bindings/clock/nxp,imx95-blk-ctl.yaml | 56 +++ + .../clock/nxp,imx95-display-master-csr.yaml | 64 +++ + drivers/clk/imx/Kconfig | 7 + + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-imx8mp-audiomix.c | 157 +++++++- + drivers/clk/imx/clk-imx95-blk-ctl.c | 438 +++++++++++++++++++++ + include/dt-bindings/clock/nxp,imx95-clock.h | 28 ++ + 7 files changed, 730 insertions(+), 21 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml + create mode 100644 Documentation/devicetree/bindings/clock/nxp,imx95-display-master-csr.yaml + create mode 100644 drivers/clk/imx/clk-imx95-blk-ctl.c + create mode 100644 include/dt-bindings/clock/nxp,imx95-clock.h +Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains) +$ 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 +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,rzg2l-cpg.yaml | 18 +- + drivers/clk/renesas/clk-r8a73a4.c | 2 - + drivers/clk/renesas/clk-r8a7740.c | 27 ++- + drivers/clk/renesas/clk-sh73a0.c | 2 - + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 7 + + drivers/clk/renesas/r9a07g043-cpg.c | 9 + + drivers/clk/renesas/r9a08g045-cpg.c | 41 +++++ + drivers/clk/renesas/rzg2l-cpg.c | 199 +++++++++++++++++++-- + drivers/clk/renesas/rzg2l-cpg.h | 67 +++++++ + include/dt-bindings/clock/r9a07g043-cpg.h | 52 ++++++ + include/dt-bindings/clock/r9a07g044-cpg.h | 58 ++++++ + include/dt-bindings/clock/r9a07g054-cpg.h | 58 ++++++ + include/dt-bindings/clock/r9a08g045-cpg.h | 70 ++++++++ + 14 files changed, 577 insertions(+), 35 deletions(-) +Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (f3334ebb8a2a LoongArch: Lately init pmu after smp is online) +$ 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 (bd622532f7b3 m68k: amiga: Use str_plural() to fix Coccinelle warning) +$ 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 'ort' strategy. + arch/m68k/amiga/config.c | 2 +- + arch/m68k/include/asm/thread_info.h | 9 +++++---- + drivers/macintosh/via-macii.c | 11 +++-------- + drivers/zorro/zorro.c | 14 ++++---------- + 4 files changed, 13 insertions(+), 23 deletions(-) +Merging m68knommu/for-next (2595108e5842 m68k: Avoid CONFIG_COLDFIRE switch in uapi header) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/include/uapi/asm/ptrace.h | 2 +- + scripts/headers_install.sh | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/kernel/Makefile | 1 - + arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging mips/mips-next (40e20fbccfb7 MIPS: SGI-IP27: micro-optimize arch_init_irq()) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + arch/mips/bcm47xx/prom.c | 3 +- + arch/mips/boot/dts/ralink/mt7621.dtsi | 440 +++++++++++++++++++--------------- + arch/mips/include/asm/asm.h | 3 + + arch/mips/include/asm/setup.h | 6 + + arch/mips/pci/pcie-octeon.c | 6 + + arch/mips/rb532/gpio.c | 2 +- + arch/mips/rb532/prom.c | 2 +- + arch/mips/sgi-ip27/ip27-irq.c | 7 +- + 8 files changed, 265 insertions(+), 204 deletions(-) + mode change 100644 => 100755 arch/mips/pci/pcie-octeon.c +Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'ort' strategy. + arch/openrisc/Kconfig | 9 +++ + arch/openrisc/include/asm/fpu.h | 22 ++++++ + arch/openrisc/include/asm/processor.h | 1 + + arch/openrisc/include/asm/ptrace.h | 3 +- + arch/openrisc/include/uapi/asm/elf.h | 75 ++++++++++++++++--- + arch/openrisc/kernel/entry.S | 15 +--- + arch/openrisc/kernel/module.c | 18 ++++- + arch/openrisc/kernel/process.c | 13 ++-- + arch/openrisc/kernel/ptrace.c | 18 ++--- + arch/openrisc/kernel/signal.c | 36 ++++++++- + arch/openrisc/kernel/traps.c | 136 ++++++++++++++++++---------------- + 11 files changed, 239 insertions(+), 107 deletions(-) + create mode 100644 arch/openrisc/include/asm/fpu.h +Merging parisc-hd/for-next (487fa28fa8b6 parisc: Define sigset_t in parisc uapi header) +$ 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 +Merge made by the 'ort' strategy. + arch/parisc/include/asm/signal.h | 12 ------------ + arch/parisc/include/uapi/asm/signal.h | 10 ++++++++++ + 2 files changed, 10 insertions(+), 12 deletions(-) +Merging powerpc/next (f318c8be797f powerpc/ptdump: Fix walk_vmemmap() to also print first vmemmap entry) +$ 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/include/asm/mmu.h +Merge made by the 'ort' strategy. + arch/powerpc/Kbuild | 3 +- + arch/powerpc/include/asm/cpu_has_feature.h | 2 +- + arch/powerpc/include/asm/feature-fixups.h | 2 + + arch/powerpc/include/asm/interrupt.h | 10 +++++ + arch/powerpc/include/asm/mmu.h | 2 +- + arch/powerpc/include/asm/percpu.h | 10 +++++ + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup_64.c | 2 + + arch/powerpc/lib/feature-fixups.c | 8 ++++ + arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_common.c | 2 - + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- + arch/powerpc/platforms/ps3/device-init.c | 61 +++++++++++++++------------- + arch/powerpc/sysdev/fsl_msi.c | 2 + + 14 files changed, 73 insertions(+), 37 deletions(-) +Merging powerpc-kdump-hotplug/topic/kdump-hotplug (849599b702ef powerpc/crash: add crash memory hotplug support) +$ git merge -m Merge branch 'topic/kdump-hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-kdump-hotplug/topic/kdump-hotplug +Auto-merging arch/powerpc/Kconfig +Auto-merging include/linux/kexec.h +Auto-merging kernel/crash_core.c +Merge made by the 'ort' strategy. + arch/powerpc/Kconfig | 4 + + arch/powerpc/include/asm/kexec.h | 15 ++ + arch/powerpc/include/asm/kexec_ranges.h | 20 +- + arch/powerpc/kexec/Makefile | 4 +- + arch/powerpc/kexec/core_64.c | 91 +++++++++ + arch/powerpc/kexec/crash.c | 196 ++++++++++++++++++++ + arch/powerpc/kexec/elf_64.c | 3 +- + arch/powerpc/kexec/file_load_64.c | 314 ++++---------------------------- + arch/powerpc/kexec/ranges.c | 312 ++++++++++++++++++++++++++++++- + arch/x86/include/asm/kexec.h | 13 +- + arch/x86/kernel/crash.c | 32 ++-- + drivers/base/cpu.c | 2 +- + drivers/base/memory.c | 2 +- + include/linux/crash_core.h | 15 +- + include/linux/kexec.h | 11 +- + include/uapi/linux/kexec.h | 1 + + kernel/crash_core.c | 29 ++- + kernel/kexec.c | 4 +- + kernel/kexec_file.c | 5 + + 19 files changed, 714 insertions(+), 359 deletions(-) +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ 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 (0a16a1728790 riscv: select ARCH_HAS_FAST_MULTIPLIER) +$ 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 Documentation/rust/arch-support.rst +CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/include/uapi/asm/hwprobe.h +Auto-merging arch/riscv/kernel/patch.c +Auto-merging include/linux/cpumask.h +Auto-merging kernel/sys.c +Resolved 'Documentation/rust/arch-support.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9b3b82b62692] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/riscv/cmodx.rst | 98 ++++++++ + Documentation/arch/riscv/hwprobe.rst | 4 + + Documentation/arch/riscv/index.rst | 1 + + Documentation/rust/arch-support.rst | 1 + + arch/riscv/Kconfig | 20 +- + arch/riscv/Makefile | 26 ++- + arch/riscv/include/asm/atomic.h | 164 ++++++------- + arch/riscv/include/asm/cache.h | 2 +- + arch/riscv/include/asm/cacheflush.h | 7 +- + arch/riscv/include/asm/cmpxchg.h | 422 ++++++++++++---------------------- + arch/riscv/include/asm/irqflags.h | 1 - + arch/riscv/include/asm/mmu.h | 2 + + arch/riscv/include/asm/patch.h | 1 + + arch/riscv/include/asm/processor.h | 10 + + arch/riscv/include/asm/signal.h | 12 - + arch/riscv/include/asm/suspend.h | 1 - + arch/riscv/include/asm/switch_to.h | 23 ++ + arch/riscv/include/uapi/asm/hwprobe.h | 1 + + arch/riscv/kernel/ftrace.c | 44 +++- + arch/riscv/kernel/patch.c | 17 +- + arch/riscv/kernel/suspend.c | 3 +- + arch/riscv/kernel/sys_hwprobe.c | 1 + + arch/riscv/kernel/sys_riscv.c | 1 - + arch/riscv/kernel/traps_misaligned.c | 106 ++------- + arch/riscv/mm/cacheflush.c | 113 +++++++++ + arch/riscv/mm/context.c | 19 +- + arch/riscv/mm/init.c | 20 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 24 +- + include/linux/cpumask.h | 16 ++ + include/uapi/linux/prctl.h | 6 + + kernel/sys.c | 6 + + scripts/generate_rust_target.rs | 6 + + 32 files changed, 661 insertions(+), 517 deletions(-) + create mode 100644 Documentation/arch/riscv/cmodx.rst + delete mode 100644 arch/riscv/include/asm/signal.h +Merging riscv-dt/riscv-dt-for-next (d866a7ef7a6e riscv: dts: thead: Fix node ordering in TH1520 device tree) +$ 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 arch/riscv/Makefile +CONFLICT (content): Merge conflict in arch/riscv/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging drivers/pinctrl/Kconfig +Resolved 'arch/riscv/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a4f67d5db3df] Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git +$ git diff -M --stat --summary HEAD^.. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/riscv/canaan.yaml | 8 +- + Documentation/devicetree/bindings/riscv/cpus.yaml | 1 + + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/Kconfig.socs | 8 +- + arch/riscv/Makefile | 2 +- + arch/riscv/boot/dts/canaan/Makefile | 2 + + arch/riscv/boot/dts/canaan/k230-canmv.dts | 24 ++++ + arch/riscv/boot/dts/canaan/k230-evb.dts | 24 ++++ + arch/riscv/boot/dts/canaan/k230.dtsi | 142 +++++++++++++++++++++ + arch/riscv/boot/dts/thead/th1520.dtsi | 54 ++++---- + arch/riscv/configs/nommu_k210_defconfig | 3 +- + arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 +- + drivers/clk/Kconfig | 4 +- + drivers/pinctrl/Kconfig | 4 +- + drivers/reset/Kconfig | 4 +- + drivers/soc/Makefile | 2 +- + drivers/soc/canaan/Kconfig | 4 +- + 18 files changed, 248 insertions(+), 43 deletions(-) + create mode 100644 arch/riscv/boot/dts/canaan/k230-canmv.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-evb.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230.dtsi +Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' into riscv-soc-for-next) +$ 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 'ort' strategy. + arch/riscv/Kconfig.socs | 14 ++++---------- + arch/riscv/configs/defconfig | 7 ++++--- + arch/riscv/configs/nommu_virt_defconfig | 2 +- + tools/testing/kunit/qemu_configs/riscv.py | 2 +- + tools/testing/selftests/wireguard/qemu/arch/riscv32.config | 2 +- + tools/testing/selftests/wireguard/qemu/arch/riscv64.config | 2 +- + 6 files changed, 12 insertions(+), 17 deletions(-) +Merging s390/for-next (e57f5e1df560 Merge branch 'shared-zeropage' 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/kernel/ipl.c +Auto-merging mm/userfaultfd.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/arch/s390/index.rst | 1 + + Documentation/arch/s390/mm.rst | 111 +++++++++ + Documentation/arch/s390/vfio-ap.rst | 32 ++- + arch/s390/Kconfig | 65 +++-- + arch/s390/Makefile | 15 +- + arch/s390/boot/Makefile | 9 +- + arch/s390/boot/boot.h | 14 +- + arch/s390/boot/decompressor.c | 15 +- + arch/s390/boot/decompressor.h | 8 +- + arch/s390/boot/kaslr.c | 2 +- + arch/s390/boot/pgm_check_info.c | 4 +- + arch/s390/boot/startup.c | 263 +++++++++++---------- + arch/s390/boot/vmem.c | 108 +++++---- + arch/s390/boot/vmlinux.lds.S | 28 +-- + arch/s390/include/asm/ap.h | 30 +-- + arch/s390/include/asm/asm-prototypes.h | 1 + + arch/s390/include/asm/chsc.h | 15 ++ + arch/s390/include/asm/extmem.h | 7 + + arch/s390/include/asm/ftrace.h | 8 +- + arch/s390/include/asm/gmap.h | 2 +- + arch/s390/include/asm/mmu.h | 5 + + arch/s390/include/asm/mmu_context.h | 1 + + arch/s390/include/asm/nospec-branch.h | 20 ++ + arch/s390/include/asm/nospec-insn.h | 13 +- + arch/s390/include/asm/os_info.h | 29 ++- + arch/s390/include/asm/page.h | 50 +++- + arch/s390/include/asm/pgtable.h | 22 +- + arch/s390/include/asm/physmem_info.h | 4 +- + arch/s390/include/asm/setup.h | 14 -- + arch/s390/kernel/Makefile | 2 + + arch/s390/kernel/crash_dump.c | 41 +++- + arch/s390/kernel/ipl.c | 6 +- + arch/s390/kernel/nospec-branch.c | 4 +- + arch/s390/kernel/os_info.c | 29 ++- + arch/s390/kernel/perf_cpum_cf.c | 2 +- + arch/s390/kernel/perf_cpum_cf_events.c | 11 +- + arch/s390/kernel/setup.c | 6 +- + arch/s390/kernel/stacktrace.c | 19 ++ + arch/s390/kernel/uv.c | 51 ++-- + arch/s390/kernel/vmcore_info.c | 2 + + arch/s390/kernel/vmlinux.lds.S | 38 +-- + arch/s390/kvm/kvm-s390.c | 4 +- + arch/s390/kvm/vsie.c | 3 +- + arch/s390/lib/Makefile | 2 +- + arch/s390/lib/{expoline => }/expoline.S | 0 + arch/s390/lib/expoline/Makefile | 3 - + arch/s390/mm/gmap.c | 165 +++++++++---- + arch/s390/mm/vmem.c | 5 +- + arch/s390/pci/pci_sysfs.c | 4 - + arch/s390/tools/relocs.c | 2 +- + drivers/crypto/Kconfig | 18 +- + drivers/s390/char/Makefile | 2 +- + drivers/s390/cio/chp.c | 141 ++++++----- + drivers/s390/cio/chp.h | 2 + + drivers/s390/cio/chsc.c | 122 +++++++--- + drivers/s390/cio/chsc.h | 5 + + drivers/s390/cio/cio_inject.c | 2 +- + drivers/s390/cio/css.c | 14 +- + drivers/s390/cio/css.h | 13 +- + drivers/s390/cio/trace.h | 2 +- + drivers/s390/crypto/Makefile | 2 +- + drivers/s390/crypto/ap_bus.c | 238 +++++++++++-------- + drivers/s390/crypto/ap_bus.h | 22 ++ + drivers/s390/crypto/ap_queue.c | 4 +- + drivers/s390/crypto/vfio_ap_ops.c | 224 ++++++++++++++++-- + drivers/s390/crypto/vfio_ap_private.h | 6 +- + mm/userfaultfd.c | 35 +++ + scripts/mod/modpost.c | 5 - + tools/testing/selftests/kvm/Makefile | 1 + + .../selftests/kvm/s390x/shared_zeropage_test.c | 110 +++++++++ + 71 files changed, 1564 insertions(+), 703 deletions(-) + create mode 100644 Documentation/arch/s390/mm.rst + rename arch/s390/lib/{expoline => }/expoline.S (100%) + delete mode 100644 arch/s390/lib/expoline/Makefile + create mode 100644 tools/testing/selftests/kvm/s390x/shared_zeropage_test.c +Merging sh/for-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (48d85acdaa52 sparc: chmc: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Merge made by the 'ort' strategy. + arch/sparc/include/asm/asm-prototypes.h | 23 +++++++++++++++-------- + arch/sparc/include/asm/floppy_64.h | 4 +--- + arch/sparc/include/asm/parport_64.h | 6 ++---- + arch/sparc/include/asm/smp_64.h | 2 -- + arch/sparc/include/uapi/asm/termbits.h | 10 ---------- + arch/sparc/include/uapi/asm/termios.h | 9 +++++++++ + arch/sparc/kernel/adi_64.c | 14 +++++++------- + arch/sparc/kernel/chmc.c | 5 ++--- + arch/sparc/kernel/kernel.h | 4 ++++ + arch/sparc/kernel/pci_sun4v.c | 6 +++--- + arch/sparc/kernel/prom_64.c | 4 +++- + arch/sparc/kernel/setup_64.c | 3 +-- + arch/sparc/kernel/smp_64.c | 14 -------------- + arch/sparc/kernel/time_64.c | 1 + + arch/sparc/kernel/traps_64.c | 10 +++++----- + arch/sparc/kernel/uprobes.c | 2 ++ + arch/sparc/mm/init_64.c | 5 ----- + arch/sparc/prom/tree_64.c | 2 +- + arch/sparc/vdso/vma.c | 5 +++-- + 19 files changed, 59 insertions(+), 70 deletions(-) +Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory) +$ 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 (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/cacheflush.h | 24 ++++++++---------------- + arch/xtensa/include/asm/processor.h | 8 ++++---- + arch/xtensa/include/asm/ptrace.h | 2 +- + arch/xtensa/kernel/process.c | 5 +++-- + arch/xtensa/kernel/stacktrace.c | 3 ++- + arch/xtensa/platforms/iss/console.c | 6 ++---- + 6 files changed, 20 insertions(+), 28 deletions(-) +Merging bcachefs/for-next (59fa5f9ea20f bcachefs: Change destroy_inode to free_inode) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Merge made by the 'ort' strategy. + fs/bcachefs/acl.c | 45 +- + fs/bcachefs/alloc_background.c | 158 +++--- + fs/bcachefs/alloc_background.h | 39 +- + fs/bcachefs/alloc_background_format.h | 2 + + fs/bcachefs/alloc_foreground.c | 116 ++-- + fs/bcachefs/alloc_foreground.h | 5 +- + fs/bcachefs/alloc_types.h | 2 + + fs/bcachefs/backpointers.c | 55 +- + fs/bcachefs/backpointers.h | 4 +- + fs/bcachefs/bcachefs.h | 18 +- + fs/bcachefs/bcachefs_format.h | 13 +- + fs/bcachefs/bkey_methods.h | 65 +-- + fs/bcachefs/btree_cache.c | 29 + + fs/bcachefs/btree_cache.h | 3 + + fs/bcachefs/btree_gc.c | 973 ++++++---------------------------- + fs/bcachefs/btree_gc.h | 44 +- + fs/bcachefs/btree_io.c | 74 +-- + fs/bcachefs/btree_iter.c | 345 ++++++++---- + fs/bcachefs/btree_iter.h | 103 ++-- + fs/bcachefs/btree_journal_iter.c | 17 + + fs/bcachefs/btree_journal_iter.h | 2 + + fs/bcachefs/btree_key_cache.c | 105 ++-- + fs/bcachefs/btree_key_cache_types.h | 8 + + fs/bcachefs/btree_locking.c | 183 ++++--- + fs/bcachefs/btree_locking.h | 4 +- + fs/bcachefs/btree_trans_commit.c | 58 +- + fs/bcachefs/btree_types.h | 115 ++-- + fs/bcachefs/btree_update.c | 95 ++-- + fs/bcachefs/btree_update.h | 22 +- + fs/bcachefs/btree_update_interior.c | 89 ++-- + fs/bcachefs/btree_update_interior.h | 7 +- + fs/bcachefs/btree_write_buffer.c | 8 +- + fs/bcachefs/buckets.c | 557 +++++++++++++------ + fs/bcachefs/buckets.h | 50 +- + fs/bcachefs/buckets_types.h | 3 +- + fs/bcachefs/chardev.c | 37 +- + fs/bcachefs/checksum.c | 12 +- + fs/bcachefs/data_update.c | 20 +- + fs/bcachefs/debug.c | 76 +-- + fs/bcachefs/dirent.c | 93 ++-- + fs/bcachefs/dirent.h | 4 +- + fs/bcachefs/disk_groups.c | 4 +- + fs/bcachefs/ec.c | 377 +++++++------ + fs/bcachefs/ec.h | 3 +- + fs/bcachefs/error.c | 59 ++- + fs/bcachefs/extent_update.c | 2 +- + fs/bcachefs/extents.c | 38 +- + fs/bcachefs/eytzinger.c | 105 +++- + fs/bcachefs/fs-common.c | 34 +- + fs/bcachefs/fs-io-buffered.c | 14 +- + fs/bcachefs/fs-io-direct.c | 2 +- + fs/bcachefs/fs-io-pagecache.c | 2 +- + fs/bcachefs/fs-io.c | 4 +- + fs/bcachefs/fs.c | 109 ++-- + fs/bcachefs/fsck.c | 212 +++----- + fs/bcachefs/inode.c | 56 +- + fs/bcachefs/inode.h | 13 +- + fs/bcachefs/io_misc.c | 10 +- + fs/bcachefs/io_read.c | 21 +- + fs/bcachefs/io_write.c | 35 +- + fs/bcachefs/journal.c | 115 ++-- + fs/bcachefs/journal.h | 4 +- + fs/bcachefs/journal_io.c | 94 ++-- + fs/bcachefs/journal_io.h | 3 + + fs/bcachefs/journal_reclaim.c | 2 +- + fs/bcachefs/journal_seq_blacklist.c | 72 +-- + fs/bcachefs/journal_seq_blacklist.h | 2 +- + fs/bcachefs/journal_types.h | 4 +- + fs/bcachefs/logged_ops.c | 2 +- + fs/bcachefs/lru.c | 2 +- + fs/bcachefs/migrate.c | 8 +- + fs/bcachefs/move.c | 53 +- + fs/bcachefs/movinggc.c | 4 +- + fs/bcachefs/opts.h | 2 +- + fs/bcachefs/printbuf.c | 232 ++++---- + fs/bcachefs/printbuf.h | 53 +- + fs/bcachefs/quota.c | 118 +---- + fs/bcachefs/rebalance.c | 10 +- + fs/bcachefs/recovery.c | 144 ++--- + fs/bcachefs/recovery_passes.c | 8 +- + fs/bcachefs/reflink.c | 66 +-- + fs/bcachefs/reflink.h | 8 +- + fs/bcachefs/replicas.c | 6 +- + fs/bcachefs/sb-clean.c | 8 +- + fs/bcachefs/sb-counters.c | 15 +- + fs/bcachefs/sb-downgrade.c | 88 ++- + fs/bcachefs/sb-downgrade.h | 1 + + fs/bcachefs/sb-errors_types.h | 4 +- + fs/bcachefs/sb-members.c | 105 ++-- + fs/bcachefs/sb-members.h | 34 +- + fs/bcachefs/sb-members_types.h | 21 + + fs/bcachefs/snapshot.c | 49 +- + fs/bcachefs/snapshot.h | 10 +- + fs/bcachefs/str_hash.h | 70 +-- + fs/bcachefs/subvolume.c | 20 +- + fs/bcachefs/subvolume.h | 3 +- + fs/bcachefs/super-io.c | 72 +-- + fs/bcachefs/super.c | 52 +- + fs/bcachefs/super_types.h | 15 - + fs/bcachefs/sysfs.c | 175 +++--- + fs/bcachefs/tests.c | 16 +- + fs/bcachefs/util.c | 61 +-- + fs/bcachefs/xattr.c | 31 +- + 103 files changed, 3238 insertions(+), 3382 deletions(-) + create mode 100644 fs/bcachefs/sb-members_types.h +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (d0af553021b4 Merge branch 'for-next-next-v6.9-20240425' into for-next-20240425) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/qgroup.c +Auto-merging fs/btrfs/volumes.c +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/backref.c | 48 +-- + fs/btrfs/block-rsv.c | 11 +- + fs/btrfs/btrfs_inode.h | 10 +- + fs/btrfs/compression.c | 119 ++--- + fs/btrfs/compression.h | 42 +- + fs/btrfs/ctree.c | 56 ++- + fs/btrfs/defrag.c | 2 +- + fs/btrfs/delayed-inode.c | 2 +- + fs/btrfs/delayed-ref.c | 365 +++++----------- + fs/btrfs/delayed-ref.h | 148 ++++--- + fs/btrfs/disk-io.c | 66 +-- + fs/btrfs/export.c | 8 +- + fs/btrfs/extent-io-tree.c | 58 +-- + fs/btrfs/extent-tree.c | 855 ++++++++++++++++++++---------------- + fs/btrfs/extent_io.c | 221 ++++++---- + fs/btrfs/extent_io.h | 11 +- + fs/btrfs/extent_map.c | 316 +++++++++++--- + fs/btrfs/extent_map.h | 12 +- + fs/btrfs/file-item.c | 70 +-- + fs/btrfs/file-item.h | 3 +- + fs/btrfs/file.c | 327 ++++++++++---- + fs/btrfs/fs.h | 4 + + fs/btrfs/inode-item.c | 16 +- + fs/btrfs/inode.c | 883 ++++++++++++++++---------------------- + fs/btrfs/ioctl.c | 86 ++-- + fs/btrfs/locking.c | 26 +- + fs/btrfs/locking.h | 18 +- + fs/btrfs/lzo.c | 89 ++-- + fs/btrfs/ordered-data.c | 8 +- + fs/btrfs/ordered-data.h | 1 + + fs/btrfs/props.c | 2 +- + fs/btrfs/qgroup.c | 75 ++-- + fs/btrfs/ref-verify.c | 8 +- + fs/btrfs/reflink.c | 56 +-- + fs/btrfs/relocation.c | 417 ++++++++---------- + fs/btrfs/root-tree.c | 3 +- + fs/btrfs/scrub.c | 142 ++---- + fs/btrfs/send.c | 74 ++-- + fs/btrfs/super.c | 33 +- + fs/btrfs/sysfs.c | 8 +- + fs/btrfs/tests/btrfs-tests.c | 3 +- + fs/btrfs/tests/extent-map-tests.c | 216 ++++++---- + fs/btrfs/transaction.c | 76 ++-- + fs/btrfs/tree-checker.c | 2 +- + fs/btrfs/tree-log.c | 46 +- + fs/btrfs/tree-mod-log.c | 2 +- + fs/btrfs/volumes.c | 17 +- + fs/btrfs/volumes.h | 1 - + fs/btrfs/xattr.c | 10 +- + fs/btrfs/zlib.c | 112 ++--- + fs/btrfs/zoned.c | 9 + + fs/btrfs/zstd.c | 80 ++-- + include/trace/events/btrfs.h | 158 +++++-- + 54 files changed, 2872 insertions(+), 2560 deletions(-) +Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (8f03ed91d75e smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/smb2pdu.h | 12 ++++++------ + fs/smb/common/smb2pdu.h | 33 ++++++++++++++++++--------------- + fs/smb/server/smb2pdu.h | 18 +++++++++--------- + 3 files changed, 33 insertions(+), 30 deletions(-) +Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Auto-merging fs/configfs/inode.c +Merge made by the 'ort' strategy. + fs/configfs/configfs_internal.h | 4 ++-- + fs/configfs/dir.c | 42 +++++++++++++++++++++++++++++++---------- + fs/configfs/inode.c | 24 ----------------------- + 3 files changed, 34 insertions(+), 36 deletions(-) +Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible) +$ 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/internal.h +Auto-merging fs/erofs/super.c +Merge made by the 'ort' strategy. + fs/erofs/Makefile | 4 +- + fs/erofs/decompressor.c | 8 +- + fs/erofs/internal.h | 20 ++-- + fs/erofs/pcpubuf.c | 148 ------------------------------ + fs/erofs/super.c | 21 +++-- + fs/erofs/{utils.c => zutil.c} | 206 ++++++++++++++++++++++++++++++++++++++---- + 6 files changed, 216 insertions(+), 191 deletions(-) + delete mode 100644 fs/erofs/pcpubuf.c + rename fs/erofs/{utils.c => zutil.c} (58%) +Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 2 ++ + fs/exfat/file.c | 9 ++++----- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8) +$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next +Already up to date. +Merging ext3/for_next (7ca906c7f7e5 Pull ext2 and isofs removal to PageError bit.) +$ 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/super.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/ext2/dir.c | 1 - + fs/ext2/file.c | 8 +- + fs/ext2/inode.c | 2 - + fs/isofs/compress.c | 4 - + fs/isofs/inode.c | 467 +++++++++++++++++++------------------ + fs/nfsd/filecache.c | 4 +- + fs/notify/dnotify/dnotify.c | 4 +- + fs/notify/fanotify/fanotify_user.c | 143 ++++-------- + fs/notify/fdinfo.c | 20 +- + fs/notify/fsnotify.c | 27 ++- + fs/notify/fsnotify.h | 47 ++-- + fs/notify/inotify/inotify_user.c | 2 +- + fs/notify/mark.c | 174 ++++++++++---- + fs/quota/dquot.c | 33 +-- + fs/reiserfs/README | 16 +- + fs/reiserfs/inode.c | 16 +- + fs/super.c | 1 + + fs/udf/file.c | 20 +- + fs/udf/inode.c | 65 +++--- + fs/udf/super.c | 8 +- + fs/udf/symlink.c | 34 +-- + fs/udf/udftime.c | 11 +- + include/linux/fs.h | 14 +- + include/linux/fsnotify.h | 21 +- + include/linux/fsnotify_backend.h | 97 +++++--- + kernel/audit_tree.c | 2 +- + kernel/audit_watch.c | 2 +- + 27 files changed, 678 insertions(+), 565 deletions(-) +Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (3763f9effcdc f2fs: use helper to print zone condition) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/super.c +Merge made by the 'ort' strategy. + Documentation/filesystems/f2fs.rst | 29 ++++++ + fs/f2fs/checkpoint.c | 13 +-- + fs/f2fs/compress.c | 42 +++++++- + fs/f2fs/data.c | 185 +++++++++++++++++++++--------------- + fs/f2fs/f2fs.h | 12 ++- + fs/f2fs/file.c | 190 +++++++++++++++++++++++-------------- + fs/f2fs/gc.c | 2 +- + fs/f2fs/inline.c | 36 +++---- + fs/f2fs/inode.c | 10 +- + fs/f2fs/node.c | 18 +++- + fs/f2fs/segment.c | 105 +++++++++++++++----- + fs/f2fs/super.c | 53 ++++++++--- + include/trace/events/f2fs.h | 42 ++++---- + 13 files changed, 492 insertions(+), 245 deletions(-) +Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (fa7e19337908 fuse: Add initial support for fs-verity) +$ 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 'ort' strategy. + fs/fuse/file.c | 10 +++------ + fs/fuse/ioctl.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/fuse/passthrough.c | 2 +- + 3 files changed, 64 insertions(+), 8 deletions(-) +Merging gfs2/for-next (1e86044402c4 gfs2: Remove and replace gfs2_glock_queue_work) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/gfs2/ops_fstype.c +Merge made by the 'ort' strategy. + fs/gfs2/bmap.c | 2 +- + fs/gfs2/dir.c | 31 +++++---- + fs/gfs2/glock.c | 192 +++++++++++++++++++++++++++++++-------------------- + fs/gfs2/glock.h | 3 +- + fs/gfs2/glops.c | 37 ++++++---- + fs/gfs2/incore.h | 1 + + fs/gfs2/lock_dlm.c | 40 ++++++++--- + fs/gfs2/log.c | 5 +- + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/rgrp.c | 10 +-- + fs/gfs2/super.c | 11 +-- + fs/gfs2/sys.c | 4 +- + fs/gfs2/util.c | 57 +++++++-------- + fs/gfs2/util.h | 4 +- + fs/gfs2/xattr.c | 28 ++++---- + 15 files changed, 254 insertions(+), 172 deletions(-) +Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin") +$ 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 (bc642d7bfdac ksmbd: fix uninitialized symbol 'share' in smb2_tree_connect()) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/smb/server/smb2pdu.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().) +$ 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 (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel) +$ 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 (06cd86b25b98 SUNRPC: Remove comment for sp_lock) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4xdr.c +Merge made by the 'ort' strategy. + Documentation/netlink/specs/nfsd.yaml | 110 +++++++ + fs/lockd/host.c | 1 - + fs/nfsd/export.c | 16 +- + fs/nfsd/netlink.c | 66 +++++ + fs/nfsd/netlink.h | 10 + + fs/nfsd/netns.h | 1 + + fs/nfsd/nfs4callback.c | 31 +- + fs/nfsd/nfs4proc.c | 41 +++ + fs/nfsd/nfs4state.c | 188 ++++++------ + fs/nfsd/nfs4xdr.c | 76 ++++- + fs/nfsd/nfsctl.c | 526 +++++++++++++++++++++++++++++++++- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfssvc.c | 11 +- + fs/nfsd/state.h | 6 +- + fs/nfsd/stats.c | 42 --- + fs/nfsd/stats.h | 5 - + fs/nfsd/trace.h | 100 ++++++- + fs/nfsd/xdr4.h | 19 ++ + include/linux/nfs4.h | 6 + + include/linux/sunrpc/svc_xprt.h | 5 + + include/uapi/linux/nfsd_netlink.h | 47 +++ + net/sunrpc/svc.c | 2 - + net/sunrpc/svc_xprt.c | 168 +++++++---- + 23 files changed, 1238 insertions(+), 241 deletions(-) +Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 32 ++++++++++++++ + fs/ntfs3/file.c | 9 ++++ + fs/ntfs3/frecord.c | 2 +- + fs/ntfs3/fslog.c | 5 ++- + fs/ntfs3/inode.c | 46 +++++++++++--------- + fs/ntfs3/namei.c | 121 ++++------------------------------------------------- + fs/ntfs3/ntfs.h | 2 +- + fs/ntfs3/ntfs_fs.h | 10 ++--- + fs/ntfs3/record.c | 11 +---- + fs/ntfs3/super.c | 2 - + fs/ntfs3/xattr.c | 5 ++- + 11 files changed, 91 insertions(+), 154 deletions(-) +Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.) +$ 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 (d17bb4620f90 overlayfs.rst: fix ReST formatting) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ 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 +Already up to date. +Merging xfs/for-next (e58ac1770ded xfs: refactor dir format helpers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + .../filesystems/xfs/xfs-online-fsck-design.rst | 632 ++++--- + fs/read_write.c | 1 + + fs/remap_range.c | 4 +- + fs/xfs/Makefile | 18 + + fs/xfs/libxfs/xfs_ag.c | 12 +- + fs/xfs/libxfs/xfs_ag_resv.c | 24 +- + fs/xfs/libxfs/xfs_ag_resv.h | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 4 +- + fs/xfs/libxfs/xfs_attr.c | 226 ++- + fs/xfs/libxfs/xfs_attr.h | 46 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 154 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 4 +- + fs/xfs/libxfs/xfs_attr_remote.c | 13 +- + fs/xfs/libxfs/xfs_attr_sf.h | 1 + + fs/xfs/libxfs/xfs_bmap.c | 202 +- + fs/xfs/libxfs/xfs_bmap.h | 11 +- + fs/xfs/libxfs/xfs_da_btree.c | 169 +- + fs/xfs/libxfs/xfs_da_btree.h | 34 +- + fs/xfs/libxfs/xfs_da_format.h | 33 +- + fs/xfs/libxfs/xfs_defer.c | 12 +- + fs/xfs/libxfs/xfs_defer.h | 10 +- + fs/xfs/libxfs/xfs_dir2.c | 283 ++- + fs/xfs/libxfs/xfs_dir2.h | 23 +- + fs/xfs/libxfs/xfs_dir2_block.c | 42 +- + fs/xfs/libxfs/xfs_dir2_data.c | 18 +- + fs/xfs/libxfs/xfs_dir2_leaf.c | 100 +- + fs/xfs/libxfs/xfs_dir2_node.c | 44 +- + fs/xfs/libxfs/xfs_dir2_priv.h | 15 +- + fs/xfs/libxfs/xfs_errortag.h | 4 +- + fs/xfs/libxfs/xfs_exchmaps.c | 1235 ++++++++++++ + fs/xfs/libxfs/xfs_exchmaps.h | 124 ++ + fs/xfs/libxfs/xfs_format.h | 34 +- + fs/xfs/libxfs/xfs_fs.h | 158 +- + fs/xfs/libxfs/xfs_health.h | 4 +- + fs/xfs/libxfs/xfs_ialloc.c | 56 +- + fs/xfs/libxfs/xfs_ialloc.h | 5 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 4 +- + fs/xfs/libxfs/xfs_inode_buf.c | 8 + + fs/xfs/libxfs/xfs_log_format.h | 89 +- + fs/xfs/libxfs/xfs_log_recover.h | 4 + + fs/xfs/libxfs/xfs_log_rlimit.c | 46 + + fs/xfs/libxfs/xfs_ondisk.h | 6 + + fs/xfs/libxfs/xfs_parent.c | 379 ++++ + fs/xfs/libxfs/xfs_parent.h | 110 ++ + fs/xfs/libxfs/xfs_rtbitmap.c | 57 + + fs/xfs/libxfs/xfs_rtbitmap.h | 17 + + fs/xfs/libxfs/xfs_sb.c | 9 + + fs/xfs/libxfs/xfs_shared.h | 6 +- + fs/xfs/libxfs/xfs_symlink_remote.c | 54 +- + fs/xfs/libxfs/xfs_symlink_remote.h | 8 +- + fs/xfs/libxfs/xfs_trans_resv.c | 328 +++- + fs/xfs/libxfs/xfs_trans_space.c | 121 ++ + fs/xfs/libxfs/xfs_trans_space.h | 29 +- + fs/xfs/scrub/agheader.c | 43 +- + fs/xfs/scrub/agheader_repair.c | 879 ++++++++- + fs/xfs/scrub/agino_bitmap.h | 49 + + fs/xfs/scrub/alloc_repair.c | 2 +- + fs/xfs/scrub/attr.c | 218 ++- + fs/xfs/scrub/attr.h | 7 + + fs/xfs/scrub/attr_repair.c | 1663 +++++++++++++++++ + fs/xfs/scrub/attr_repair.h | 15 + + fs/xfs/scrub/bitmap.c | 22 +- + fs/xfs/scrub/common.c | 41 +- + fs/xfs/scrub/common.h | 27 +- + fs/xfs/scrub/dab_bitmap.h | 37 + + fs/xfs/scrub/dabtree.c | 24 + + fs/xfs/scrub/dabtree.h | 3 + + fs/xfs/scrub/dir.c | 377 +++- + fs/xfs/scrub/dir_repair.c | 1958 ++++++++++++++++++++ + fs/xfs/scrub/dirtree.c | 985 ++++++++++ + fs/xfs/scrub/dirtree.h | 178 ++ + fs/xfs/scrub/dirtree_repair.c | 821 ++++++++ + fs/xfs/scrub/findparent.c | 454 +++++ + fs/xfs/scrub/findparent.h | 56 + + fs/xfs/scrub/fscounters.c | 14 +- + fs/xfs/scrub/fscounters.h | 1 + + fs/xfs/scrub/fscounters_repair.c | 12 +- + fs/xfs/scrub/health.c | 1 + + fs/xfs/scrub/ino_bitmap.h | 37 + + fs/xfs/scrub/inode.c | 19 + + fs/xfs/scrub/inode_repair.c | 153 +- + fs/xfs/scrub/iscan.c | 67 +- + fs/xfs/scrub/iscan.h | 16 + + fs/xfs/scrub/listxattr.c | 320 ++++ + fs/xfs/scrub/listxattr.h | 19 + + fs/xfs/scrub/nlinks.c | 133 +- + fs/xfs/scrub/nlinks.h | 7 + + fs/xfs/scrub/nlinks_repair.c | 186 +- + fs/xfs/scrub/orphanage.c | 627 +++++++ + fs/xfs/scrub/orphanage.h | 86 + + fs/xfs/scrub/parent.c | 700 ++++++- + fs/xfs/scrub/parent_repair.c | 1612 ++++++++++++++++ + fs/xfs/scrub/readdir.c | 150 +- + fs/xfs/scrub/readdir.h | 3 + + fs/xfs/scrub/reap.c | 443 ++++- + fs/xfs/scrub/reap.h | 21 + + fs/xfs/scrub/repair.c | 127 +- + fs/xfs/scrub/repair.h | 31 + + fs/xfs/scrub/rmap_repair.c | 24 +- + fs/xfs/scrub/rtsummary.c | 33 +- + fs/xfs/scrub/rtsummary.h | 37 + + fs/xfs/scrub/rtsummary_repair.c | 175 ++ + fs/xfs/scrub/scrub.c | 310 +++- + fs/xfs/scrub/scrub.h | 91 + + fs/xfs/scrub/stats.c | 1 + + fs/xfs/scrub/symlink.c | 13 +- + fs/xfs/scrub/symlink_repair.c | 509 +++++ + fs/xfs/scrub/tempexch.h | 22 + + fs/xfs/scrub/tempfile.c | 851 +++++++++ + fs/xfs/scrub/tempfile.h | 48 + + fs/xfs/scrub/trace.c | 6 + + fs/xfs/scrub/trace.h | 1307 ++++++++++++- + fs/xfs/scrub/xfarray.c | 27 +- + fs/xfs/scrub/xfarray.h | 6 + + fs/xfs/scrub/xfblob.c | 168 ++ + fs/xfs/scrub/xfblob.h | 50 + + fs/xfs/scrub/xfile.c | 14 +- + fs/xfs/scrub/xfile.h | 6 + + fs/xfs/scrub/xfs_scrub.h | 6 +- + fs/xfs/xfs_acl.c | 17 +- + fs/xfs/xfs_attr_item.c | 560 +++++- + fs/xfs/xfs_attr_item.h | 10 + + fs/xfs/xfs_attr_list.c | 120 +- + fs/xfs/xfs_bmap_util.c | 4 +- + fs/xfs/xfs_buf.c | 3 + + fs/xfs/xfs_dir2_readdir.c | 25 +- + fs/xfs/xfs_discard.c | 153 +- + fs/xfs/xfs_dquot.c | 41 + + fs/xfs/xfs_dquot.h | 1 + + fs/xfs/xfs_error.c | 3 + + fs/xfs/xfs_exchmaps_item.c | 614 ++++++ + fs/xfs/xfs_exchmaps_item.h | 64 + + fs/xfs/xfs_exchrange.c | 804 ++++++++ + fs/xfs/xfs_exchrange.h | 38 + + fs/xfs/xfs_export.c | 4 +- + fs/xfs/xfs_export.h | 2 + + fs/xfs/xfs_extent_busy.c | 80 +- + fs/xfs/xfs_file.c | 88 +- + fs/xfs/xfs_file.h | 15 + + fs/xfs/xfs_fsmap.c | 4 +- + fs/xfs/xfs_fsops.c | 29 +- + fs/xfs/xfs_fsops.h | 2 +- + fs/xfs/xfs_handle.c | 952 ++++++++++ + fs/xfs/xfs_handle.h | 33 + + fs/xfs/xfs_health.c | 1 + + fs/xfs/xfs_inode.c | 496 ++++- + fs/xfs/xfs_inode.h | 27 +- + fs/xfs/xfs_ioctl.c | 625 +------ + fs/xfs/xfs_ioctl.h | 28 - + fs/xfs/xfs_ioctl32.c | 1 + + fs/xfs/xfs_iomap.c | 45 +- + fs/xfs/xfs_iops.c | 23 +- + fs/xfs/xfs_iops.h | 7 +- + fs/xfs/xfs_itable.c | 8 + + fs/xfs/xfs_iwalk.c | 4 +- + fs/xfs/xfs_linux.h | 5 + + fs/xfs/xfs_log.c | 28 +- + fs/xfs/xfs_log.h | 2 - + fs/xfs/xfs_log_cil.c | 2 +- + fs/xfs/xfs_log_priv.h | 8 +- + fs/xfs/xfs_log_recover.c | 52 +- + fs/xfs/xfs_mount.c | 111 +- + fs/xfs/xfs_mount.h | 88 +- + fs/xfs/xfs_qm.c | 4 +- + fs/xfs/xfs_qm.h | 2 +- + fs/xfs/xfs_rtalloc.c | 22 +- + fs/xfs/xfs_super.c | 76 +- + fs/xfs/xfs_symlink.c | 93 +- + fs/xfs/xfs_trace.c | 3 + + fs/xfs/xfs_trace.h | 440 ++++- + fs/xfs/xfs_trans.c | 72 +- + fs/xfs/xfs_trans_dquot.c | 15 +- + fs/xfs/xfs_xattr.c | 92 +- + fs/xfs/xfs_xattr.h | 3 +- + include/linux/fs.h | 1 + + 175 files changed, 24764 insertions(+), 2666 deletions(-) + create mode 100644 fs/xfs/libxfs/xfs_exchmaps.c + create mode 100644 fs/xfs/libxfs/xfs_exchmaps.h + create mode 100644 fs/xfs/libxfs/xfs_parent.c + create mode 100644 fs/xfs/libxfs/xfs_parent.h + create mode 100644 fs/xfs/libxfs/xfs_trans_space.c + create mode 100644 fs/xfs/scrub/agino_bitmap.h + create mode 100644 fs/xfs/scrub/attr_repair.c + create mode 100644 fs/xfs/scrub/attr_repair.h + create mode 100644 fs/xfs/scrub/dab_bitmap.h + create mode 100644 fs/xfs/scrub/dir_repair.c + create mode 100644 fs/xfs/scrub/dirtree.c + create mode 100644 fs/xfs/scrub/dirtree.h + create mode 100644 fs/xfs/scrub/dirtree_repair.c + create mode 100644 fs/xfs/scrub/findparent.c + create mode 100644 fs/xfs/scrub/findparent.h + create mode 100644 fs/xfs/scrub/ino_bitmap.h + create mode 100644 fs/xfs/scrub/listxattr.c + create mode 100644 fs/xfs/scrub/listxattr.h + create mode 100644 fs/xfs/scrub/orphanage.c + create mode 100644 fs/xfs/scrub/orphanage.h + create mode 100644 fs/xfs/scrub/parent_repair.c + create mode 100644 fs/xfs/scrub/rtsummary.h + create mode 100644 fs/xfs/scrub/rtsummary_repair.c + create mode 100644 fs/xfs/scrub/symlink_repair.c + create mode 100644 fs/xfs/scrub/tempexch.h + create mode 100644 fs/xfs/scrub/tempfile.c + create mode 100644 fs/xfs/scrub/tempfile.h + create mode 100644 fs/xfs/scrub/xfblob.c + create mode 100644 fs/xfs/scrub/xfblob.h + create mode 100644 fs/xfs/xfs_exchmaps_item.c + create mode 100644 fs/xfs/xfs_exchmaps_item.h + create mode 100644 fs/xfs/xfs_exchrange.c + create mode 100644 fs/xfs/xfs_exchrange.h + create mode 100644 fs/xfs/xfs_file.h + create mode 100644 fs/xfs/xfs_handle.c + create mode 100644 fs/xfs/xfs_handle.h +Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api) +$ 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 (3ac974796e5d iomap: fix short copy in iomap_write_iter()) +$ 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 (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) +$ 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 (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ 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 (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ 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-brauner/vfs.all (eea3260250ea Merge branch 'vfs.iomap' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging block/bdev.c +Auto-merging block/ioctl.c +Auto-merging drivers/dax/device.c +Auto-merging fs/bcachefs/fs.c +Auto-merging fs/bcachefs/util.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/zoned.c +Auto-merging fs/buffer.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/read_write.c +Auto-merging fs/userfaultfd.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/jbd2.h +Auto-merging io_uring/io_uring.c +Auto-merging mm/mmap.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + block/bdev.c | 33 ++++-- + block/blk-zoned.c | 4 +- + block/fops.c | 5 +- + block/genhd.c | 2 +- + block/ioctl.c | 14 +-- + block/partitions/core.c | 2 +- + drivers/dax/device.c | 2 +- + drivers/md/bcache/super.c | 2 +- + drivers/md/dm-vdo/dm-vdo-target.c | 4 +- + drivers/md/dm-vdo/indexer/io-factory.c | 2 +- + drivers/mtd/devices/block2mtd.c | 6 +- + drivers/scsi/scsicam.c | 2 +- + fs/aio.c | 93 ++++++++-------- + fs/bcachefs/fs.c | 3 + + fs/bcachefs/util.h | 5 - + fs/btrfs/disk-io.c | 6 +- + fs/btrfs/file.c | 4 +- + fs/btrfs/inode.c | 3 + + fs/btrfs/volumes.c | 2 +- + fs/btrfs/zoned.c | 2 +- + fs/buffer.c | 10 +- + fs/cramfs/inode.c | 2 +- + fs/dcache.c | 2 +- + fs/debugfs/inode.c | 194 ++++++++++++++++----------------- + fs/direct-io.c | 1 - + fs/ecryptfs/keystore.c | 4 +- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4_jbd2.c | 2 +- + fs/ext4/file.c | 6 +- + fs/ext4/super.c | 28 +---- + fs/f2fs/file.c | 3 +- + fs/fhandle.c | 6 +- + fs/freevxfs/vxfs_super.c | 69 +++++++----- + fs/fs-writeback.c | 57 ++++++---- + fs/gfs2/glock.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hugetlbfs/inode.c | 5 +- + fs/iomap/buffered-io.c | 121 ++++++++++---------- + fs/jbd2/journal.c | 2 +- + fs/jffs2/xattr.c | 3 + + fs/libfs.c | 55 +++++++++- + fs/minix/inode.c | 48 +++++--- + fs/namei.c | 19 +++- + fs/nilfs2/ioctl.c | 2 +- + fs/openpromfs/inode.c | 8 +- + fs/orangefs/dcache.c | 4 +- + fs/orangefs/namei.c | 26 ++--- + fs/orangefs/super.c | 17 +-- + fs/overlayfs/params.c | 4 - + fs/proc/proc_net.c | 1 + + fs/qnx6/inode.c | 113 +++++++++++-------- + fs/read_write.c | 2 +- + fs/signalfd.c | 44 +++++--- + fs/stat.c | 1 + + fs/timerfd.c | 36 ++++-- + fs/tracefs/inode.c | 194 +++++++++++++++------------------ + fs/userfaultfd.c | 44 +++++--- + fs/xfs/xfs_file.c | 10 +- + include/linux/blk_types.h | 1 + + include/linux/blkdev.h | 12 +- + include/linux/buffer_head.h | 4 +- + include/linux/fs.h | 91 +++++++++------- + include/linux/fs_parser.h | 4 + + include/linux/hugetlb.h | 8 +- + include/linux/jbd2.h | 4 +- + include/linux/namei.h | 1 + + include/linux/shm.h | 5 - + include/linux/stat.h | 1 + + include/linux/uio.h | 10 ++ + include/net/udp.h | 9 +- + include/uapi/linux/stat.h | 4 +- + io_uring/io_uring.c | 2 +- + io_uring/rw.c | 9 +- + ipc/shm.c | 10 +- + mm/mmap.c | 4 +- + mm/shmem.c | 3 +- + 76 files changed, 825 insertions(+), 702 deletions(-) +Merging vfs/for-next (7c98f7cb8fda remove call_{read,write}_iter() functions) +$ 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 fs/aio.c +Auto-merging fs/read_write.c +Auto-merging include/linux/fs.h +Auto-merging io_uring/rw.c +Merge made by the 'ort' strategy. + drivers/block/loop.c | 4 ++-- + drivers/target/target_core_file.c | 4 ++-- + fs/aio.c | 4 ++-- + fs/cachefiles/namei.c | 3 +-- + fs/file.c | 19 ++++++++----------- + fs/open.c | 11 +++++------ + fs/overlayfs/util.c | 2 +- + fs/proc/fd.c | 4 +--- + fs/read_write.c | 12 ++++++------ + fs/splice.c | 4 ++-- + include/linux/fdtable.h | 15 +++++---------- + include/linux/fs.h | 14 +------------- + io_uring/rw.c | 4 ++-- + 13 files changed, 38 insertions(+), 62 deletions(-) +Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' 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 +Merge made by the 'ort' strategy. + include/linux/ceph/ceph_debug.h | 18 +++++++----------- + include/linux/dev_printk.h | 25 +++++++++++++------------ + include/linux/dynamic_debug.h | 4 ++-- + include/linux/printk.h | 2 +- + 4 files changed, 23 insertions(+), 26 deletions(-) +Merging pci/next (ccd0bdb57e31 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/wangxun/libwx/wx_lib.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/tty/serial/8250/8250_pci.c +Merge made by the 'ort' strategy. + Documentation/PCI/msi-howto.rst | 2 +- + Documentation/PCI/pci.rst | 2 +- + Documentation/PCI/pcieaer-howto.rst | 2 +- + .../devicetree/bindings/pci/rcar-pci-host.yaml | 3 + + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 5 + + Documentation/translations/zh_CN/PCI/msi-howto.rst | 2 +- + Documentation/translations/zh_CN/PCI/pci.rst | 2 +- + arch/x86/kernel/apic/msi.c | 5 - + drivers/ata/pata_cs5520.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 5 +- + drivers/infiniband/hw/qib/qib_pcie.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- + drivers/iommu/amd/iommu.c | 17 +- + drivers/iommu/intel/irq_remapping.c | 19 +- + drivers/mfd/intel-lpss-pci.c | 2 +- + drivers/misc/vmw_vmci/vmci_guest.c | 3 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 9 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +- + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 8 +- + drivers/net/wireless/ath/ath10k/ahb.c | 18 +- + drivers/net/wireless/ath/ath10k/pci.c | 36 ++-- + drivers/net/wireless/ath/ath10k/pci.h | 6 +- + drivers/net/wireless/realtek/rtw88/pci.c | 2 +- + drivers/net/wireless/realtek/rtw89/pci.c | 2 +- + drivers/ntb/hw/idt/ntb_hw_idt.c | 2 +- + drivers/pci/controller/cadence/pcie-cadence-ep.c | 7 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 9 + + drivers/pci/controller/dwc/pci-imx6.c | 10 + + drivers/pci/controller/dwc/pci-keystone.c | 11 + + drivers/pci/controller/dwc/pci-layerscape-ep.c | 9 + + drivers/pci/controller/dwc/pcie-artpec6.c | 15 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 240 ++++++++++++++------- + drivers/pci/controller/dwc/pcie-designware-plat.c | 11 + + drivers/pci/controller/dwc/pcie-designware.h | 14 +- + drivers/pci/controller/dwc/pcie-keembay.c | 18 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 4 +- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 28 ++- + drivers/pci/controller/dwc/pcie-tegra194.c | 8 +- + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 15 +- + drivers/pci/controller/pcie-mt7621.c | 2 +- + drivers/pci/controller/pcie-rcar-ep.c | 2 + + drivers/pci/controller/pcie-rockchip-ep.c | 10 +- + drivers/pci/doe.c | 12 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 80 ++----- + drivers/pci/endpoint/pci-ep-cfs.c | 9 + + drivers/pci/endpoint/pci-epc-core.c | 22 ++ + drivers/pci/endpoint/pci-epf-core.c | 9 +- + drivers/pci/msi/api.c | 58 +---- + drivers/pci/msi/irqdomain.c | 59 ----- + drivers/pci/pci.c | 30 ++- + drivers/pci/pcie/Kconfig | 2 +- + drivers/pci/pcie/aer_inject.c | 2 +- + drivers/pci/pcie/portdrv.c | 8 +- + drivers/pci/probe.c | 2 +- + drivers/pci/quirks.c | 20 ++ + drivers/platform/x86/intel_ips.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/usb/core/hcd-pci.c | 3 +- + include/linux/irqdomain_defs.h | 1 - + include/linux/msi.h | 2 - + include/linux/msi_api.h | 1 - + include/linux/pci-epc.h | 7 +- + include/linux/pci.h | 39 +--- + include/uapi/linux/pci_regs.h | 1 + + sound/soc/intel/avs/core.c | 2 +- + 82 files changed, 515 insertions(+), 471 deletions(-) +Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy) +$ 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 'ort' strategy. + fs/pstore/blk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (d82775b90601 Merge branch 'for-6.10/sony' 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 +Auto-merging include/linux/hid_bpf.h +Merge made by the 'ort' strategy. + Documentation/hid/hid-bpf.rst | 2 +- + drivers/hid/Kconfig | 16 + + drivers/hid/Makefile | 1 + + drivers/hid/bpf/hid_bpf_dispatch.c | 226 +- + drivers/hid/hid-core.c | 2 + + drivers/hid/hid-corsair.c | 4 +- + drivers/hid/hid-debug.c | 3400 +++++++++++++++++--- + drivers/hid/hid-google-hammer.c | 5 +- + drivers/hid/hid-lenovo.c | 23 +- + drivers/hid/hid-nintendo.c | 57 +- + drivers/hid/hid-picolcd_core.c | 6 +- + drivers/hid/hid-picolcd_fb.c | 8 +- + drivers/hid/hid-playstation.c | 108 +- + drivers/hid/hid-roccat-isku.c | 2 +- + drivers/hid/hid-roccat-kone.c | 12 +- + drivers/hid/hid-roccat-koneplus.c | 4 +- + drivers/hid/hid-roccat-kovaplus.c | 10 +- + drivers/hid/hid-roccat-pyra.c | 6 +- + drivers/hid/hid-sensor-custom.c | 17 +- + drivers/hid/hid-sony.c | 7 +- + drivers/hid/hid-uclogic-params.c | 3 + + drivers/hid/hid-winwing.c | 226 ++ + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 45 +- + drivers/hid/intel-ish-hid/ipc/ipc.c | 14 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 59 +- + drivers/hid/surface-hid/surface_kbd.c | 5 +- + include/linux/hid_bpf.h | 3 + + tools/testing/selftests/hid/config.common | 1 + + tools/testing/selftests/hid/hid_bpf.c | 112 +- + tools/testing/selftests/hid/progs/hid.c | 46 + + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 6 + + 31 files changed, 3747 insertions(+), 689 deletions(-) + create mode 100644 drivers/hid/hid-winwing.c +Merging i2c/i2c/for-next (5deb5b56bccb i2c: smbus: fix NULL function pointer dereference) +$ 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 +Merge made by the 'ort' strategy. + drivers/i2c/i2c-core-smbus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging i2c-host/i2c/i2c-host (8a603d2c41de i2c: ali15x3: remove printout on handled timeouts) +$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/i2c/i2c-pnx.txt | 34 -- + .../devicetree/bindings/i2c/nxp,pnx-i2c.yaml | 46 +++ + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 19 + + .../devicetree/bindings/i2c/renesas,riic.yaml | 19 +- + MAINTAINERS | 12 +- + drivers/i2c/busses/Kconfig | 49 ++- + drivers/i2c/busses/Makefile | 3 + + drivers/i2c/busses/i2c-ali1535.c | 8 +- + drivers/i2c/busses/i2c-ali1563.c | 1 - + drivers/i2c/busses/i2c-ali15x3.c | 4 +- + drivers/i2c/busses/i2c-at91-master.c | 1 - + drivers/i2c/busses/i2c-bcm-iproc.c | 2 - + drivers/i2c/busses/i2c-bcm2835.c | 1 - + drivers/i2c/busses/i2c-cadence.c | 2 - + drivers/i2c/busses/i2c-davinci.c | 1 - + drivers/i2c/busses/i2c-designware-platdrv.c | 1 + + drivers/i2c/busses/i2c-i801.c | 41 +- + drivers/i2c/busses/i2c-img-scb.c | 5 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 19 +- + drivers/i2c/busses/i2c-ismt.c | 1 - + drivers/i2c/busses/i2c-mpc.c | 11 +- + drivers/i2c/busses/i2c-nomadik.c | 7 +- + drivers/i2c/busses/i2c-ocores.c | 21 +- + drivers/i2c/busses/i2c-octeon-core.c | 141 +++++-- + drivers/i2c/busses/i2c-octeon-core.h | 53 ++- + drivers/i2c/busses/i2c-omap.c | 1 - + drivers/i2c/busses/i2c-qcom-geni.c | 5 +- + drivers/i2c/busses/i2c-qup.c | 4 +- + drivers/i2c/busses/i2c-riic.c | 125 ++++-- + drivers/i2c/busses/i2c-rk3x.c | 3 - + drivers/i2c/busses/i2c-sh_mobile.c | 1 - + drivers/i2c/busses/i2c-st.c | 5 +- + drivers/i2c/busses/i2c-tegra.c | 2 - + drivers/i2c/busses/i2c-thunderx-pcidrv.c | 13 +- + drivers/i2c/busses/i2c-uniphier-f.c | 1 - + drivers/i2c/busses/i2c-uniphier.c | 4 +- + drivers/i2c/busses/i2c-viai2c-common.c | 256 +++++++++++++ + drivers/i2c/busses/i2c-viai2c-common.h | 85 +++++ + drivers/i2c/busses/i2c-viai2c-wmt.c | 148 ++++++++ + drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 298 +++++++++++++++ + drivers/i2c/busses/i2c-viperboard.c | 1 - + drivers/i2c/busses/i2c-wmt.c | 421 --------------------- + drivers/i2c/muxes/i2c-mux-gpio.c | 3 +- + include/linux/platform_data/i2c-mux-gpio.h | 2 - + 44 files changed, 1219 insertions(+), 661 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-pnx.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nxp,pnx-i2c.yaml + create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c + create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h + create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c + create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c + delete mode 100644 drivers/i2c/busses/i2c-wmt.c +Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (868577e6bfe1 firmware: dmi: Stop decoding on broken entry) +$ 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 +Merge made by the 'ort' strategy. + drivers/firmware/dmi-id.c | 7 ++++++- + drivers/firmware/dmi_scan.c | 11 +++++++++++ + 2 files changed, 17 insertions(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (2ba3ec0d5d4a hwmon: (nzxt-kraken3) Add support for NZXT Kraken 2023 (standard and Elite) models) +$ 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 +Auto-merging include/acpi/acpi_bus.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/adc128d818.txt | 38 -- + .../devicetree/bindings/hwmon/adi,adm1275.yaml | 4 +- + Documentation/devicetree/bindings/hwmon/as370.txt | 11 - + .../devicetree/bindings/hwmon/ibm,opal-sensor.yaml | 37 ++ + .../devicetree/bindings/hwmon/ibm,p8-occ-hwmon.txt | 25 - + .../devicetree/bindings/hwmon/ibmpowernv.txt | 23 - + Documentation/devicetree/bindings/hwmon/lm87.txt | 30 - + .../devicetree/bindings/hwmon/max6650.txt | 28 - + .../devicetree/bindings/hwmon/maxim,max6650.yaml | 70 +++ + .../bindings/hwmon/pmbus/adi,adp1050.yaml | 49 ++ + .../devicetree/bindings/hwmon/pwm-fan.txt | 1 - + .../devicetree/bindings/hwmon/st,stts751.yaml | 41 ++ + .../devicetree/bindings/hwmon/stts751.txt | 15 - + .../devicetree/bindings/hwmon/syna,as370.yaml | 32 ++ + .../devicetree/bindings/hwmon/ti,adc128d818.yaml | 63 +++ + .../devicetree/bindings/hwmon/ti,lm87.yaml | 69 +++ + .../devicetree/bindings/trivial-devices.yaml | 4 + + Documentation/hwmon/adm1275.rst | 14 +- + Documentation/hwmon/adp1050.rst | 64 +++ + Documentation/hwmon/aquacomputer_d5next.rst | 9 +- + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/lm70.rst | 2 +- + Documentation/hwmon/nzxt-kraken3.rst | 19 +- + Documentation/hwmon/xdp710.rst | 83 +++ + MAINTAINERS | 7 + + drivers/acpi/acpi_ipmi.c | 23 +- + drivers/hwmon/Kconfig | 37 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/acpi_power_meter.c | 16 + + drivers/hwmon/aquacomputer_d5next.c | 51 +- + drivers/hwmon/aspeed-g6-pwm-tach.c | 6 +- + drivers/hwmon/coretemp.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 15 + + drivers/hwmon/it87.c | 127 +++-- + drivers/hwmon/jc42.c | 2 +- + drivers/hwmon/lenovo-ec-sensors.c | 602 +++++++++++++++++++++ + drivers/hwmon/lm70.c | 4 +- + drivers/hwmon/nzxt-kraken3.c | 55 +- + drivers/hwmon/pmbus/Kconfig | 23 +- + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/adm1275.c | 7 +- + drivers/hwmon/pmbus/adp1050.c | 56 ++ + drivers/hwmon/pmbus/mp2975.c | 136 ++++- + drivers/hwmon/pmbus/xdp710.c | 131 +++++ + drivers/hwmon/pwm-fan.c | 45 +- + include/acpi/acpi_bus.h | 5 + + 46 files changed, 1734 insertions(+), 352 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/adc128d818.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/as370.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,opal-sensor.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibm,p8-occ-hwmon.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibmpowernv.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/lm87.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/max6650.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max6650.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/adi,adp1050.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/pwm-fan.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/st,stts751.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/stts751.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/syna,as370.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,adc128d818.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,lm87.yaml + create mode 100644 Documentation/hwmon/adp1050.rst + create mode 100644 Documentation/hwmon/xdp710.rst + create mode 100644 drivers/hwmon/lenovo-ec-sensors.c + create mode 100644 drivers/hwmon/pmbus/adp1050.c + create mode 100644 drivers/hwmon/pmbus/xdp710.c +Merging jc_docs/docs-next (fcb5bcefdbfb Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging .mailmap +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging mm/Kconfig +Auto-merging scripts/kernel-doc +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/Makefile | 7 +- + .../admin-guide/hw-vuln/core-scheduling.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 10 +- + .../admin-guide/reporting-regressions.rst | 10 +- + Documentation/core-api/dma-api-howto.rst | 24 +- + Documentation/doc-guide/parse-headers.rst | 2 +- + Documentation/index.rst | 2 +- + Documentation/process/handling-regressions.rst | 2 +- + Documentation/security/snp-tdx-threat-model.rst | 2 +- + Documentation/sphinx/kerneldoc-preamble.sty | 9 +- + Documentation/trace/tracepoints.rst | 2 +- + Documentation/translations/it_IT/index.rst | 2 +- + Documentation/translations/sp_SP/index.rst | 2 +- + .../translations/sp_SP/memory-barriers.txt | 4 +- + .../translations/sp_SP/process/1.Intro.rst | 302 ++++++++++++ + .../translations/sp_SP/process/2.Process.rst | 542 +++++++++++++++++++++ + .../translations/sp_SP/process/3.Early-stage.rst | 11 + + .../translations/sp_SP/process/4.Coding.rst | 11 + + .../translations/sp_SP/process/5.Posting.rst | 11 + + .../translations/sp_SP/process/6.Followthrough.rst | 11 + + .../sp_SP/process/7.AdvancedTopics.rst | 11 + + .../translations/sp_SP/process/8.Conclusion.rst | 11 + + .../translations/sp_SP/process/code-of-conduct.rst | 2 +- + .../translations/sp_SP/process/coding-style.rst | 2 +- + .../sp_SP/process/development-process.rst | 27 + + .../translations/sp_SP/process/email-clients.rst | 2 +- + Documentation/translations/sp_SP/process/howto.rst | 2 +- + Documentation/translations/sp_SP/process/index.rst | 1 + + .../translations/sp_SP/process/kernel-docs.rst | 2 +- + .../sp_SP/process/kernel-enforcement-statement.rst | 2 +- + .../translations/sp_SP/process/magic-number.rst | 2 +- + .../sp_SP/process/programming-language.rst | 2 +- + .../sp_SP/process/submitting-patches.rst | 30 +- + .../translations/zh_CN/dev-tools/index.rst | 6 +- + .../translations/zh_CN/dev-tools/kcov.rst | 359 ++++++++++++++ + .../translations/zh_CN/dev-tools/kmemleak.rst | 229 +++++++++ + .../translations/zh_CN/dev-tools/ubsan.rst | 91 ++++ + Documentation/translations/zh_CN/process/cve.rst | 89 ++++ + Documentation/translations/zh_CN/process/index.rst | 1 + + .../zh_CN/process/submitting-patches.rst | 8 +- + .../zh_TW/process/submitting-patches.rst | 8 +- + MAINTAINERS | 9 +- + mm/Kconfig | 7 +- + scripts/check-variable-fonts.sh | 117 +++++ + scripts/kernel-doc | 3 +- + scripts/sphinx-pre-install | 5 +- + 47 files changed, 1940 insertions(+), 59 deletions(-) + create mode 100644 Documentation/translations/sp_SP/process/1.Intro.rst + create mode 100644 Documentation/translations/sp_SP/process/2.Process.rst + create mode 100644 Documentation/translations/sp_SP/process/3.Early-stage.rst + create mode 100644 Documentation/translations/sp_SP/process/4.Coding.rst + create mode 100644 Documentation/translations/sp_SP/process/5.Posting.rst + create mode 100644 Documentation/translations/sp_SP/process/6.Followthrough.rst + create mode 100644 Documentation/translations/sp_SP/process/7.AdvancedTopics.rst + create mode 100644 Documentation/translations/sp_SP/process/8.Conclusion.rst + create mode 100644 Documentation/translations/sp_SP/process/development-process.rst + create mode 100644 Documentation/translations/zh_CN/dev-tools/kcov.rst + create mode 100644 Documentation/translations/zh_CN/dev-tools/kmemleak.rst + create mode 100644 Documentation/translations/zh_CN/dev-tools/ubsan.rst + create mode 100644 Documentation/translations/zh_CN/process/cve.rst + create mode 100755 scripts/check-variable-fonts.sh +Merging v4l-dvb/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_if.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/mgb4.rst | 35 +- + .../devicetree/bindings/media/i2c/ovti,ov2680.yaml | 35 +- + .../bindings/media/qcom,sc8280xp-camss.yaml | 512 +++++++++++++++++++++ + .../userspace-api/media/dvb/frontend_f_open.rst | 2 +- + Documentation/userspace-api/media/v4l/mmap.rst | 2 +- + .../userspace-api/media/v4l/user-func.rst | 1 + + .../userspace-api/media/v4l/vidioc-remove-bufs.rst | 86 ++++ + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 1 + + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 9 +- + drivers/media/common/videobuf2/videobuf2-core.c | 223 ++++++--- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 34 +- + drivers/media/dvb-core/dvbdev.c | 2 +- + drivers/media/dvb-frontends/cxd2880/Kconfig | 2 +- + drivers/media/i2c/adv748x/adv748x-hdmi.c | 16 +- + drivers/media/i2c/adv7511-v4l2.c | 16 +- + drivers/media/i2c/adv7604.c | 20 +- + drivers/media/i2c/adv7842.c | 25 +- + drivers/media/i2c/dw9714.c | 6 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 4 +- + drivers/media/i2c/ov2680.c | 10 +- + drivers/media/i2c/ov2740.c | 11 +- + drivers/media/i2c/tc358743.c | 25 +- + drivers/media/i2c/tda1997x.c | 14 +- + drivers/media/i2c/ths7303.c | 10 +- + drivers/media/i2c/ths8200.c | 14 +- + drivers/media/i2c/tvp7002.c | 32 +- + drivers/media/mc/mc-entity.c | 6 + + drivers/media/mmc/siano/smssdio.c | 25 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 12 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 29 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 4 - + drivers/media/pci/ngene/ngene-core.c | 4 +- + .../platform/chips-media/wave5/wave5-helper.c | 17 +- + .../platform/chips-media/wave5/wave5-vpu-dec.c | 13 +- + .../platform/chips-media/wave5/wave5-vpu-enc.c | 13 +- + .../media/platform/chips-media/wave5/wave5-vpu.c | 125 +++-- + .../platform/chips-media/wave5/wave5-vpuapi.h | 4 + + .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 2 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h | 4 +- + .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c | 20 +- + .../mediatek/vcodec/decoder/vdec/vdec_h264_if.c | 12 +- + .../vcodec/decoder/vdec/vdec_h264_req_common.h | 15 +- + .../vcodec/decoder/vdec/vdec_h264_req_if.c | 14 +- + .../vcodec/decoder/vdec/vdec_h264_req_multi_if.c | 6 +- + .../vcodec/decoder/vdec/vdec_hevc_req_multi_if.c | 4 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_if.c | 4 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c | 2 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp9_if.c | 4 +- + .../mediatek/vcodec/decoder/vdec_msg_queue.h | 4 +- + .../platform/mediatek/vcodec/decoder/vdec_vpu_if.h | 4 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 2 +- + .../platform/mediatek/vcodec/encoder/venc_drv_if.h | 2 +- + drivers/media/platform/qcom/camss/Makefile | 2 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 108 ++++- + drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + + .../camss/{camss-vfe-170.c => camss-vfe-17x.c} | 0 + drivers/media/platform/qcom/camss/camss-vfe.c | 25 +- + drivers/media/platform/qcom/camss/camss-video.c | 1 + + drivers/media/platform/qcom/camss/camss.c | 307 ++++++++++++ + drivers/media/platform/qcom/camss/camss.h | 1 + + .../media/platform/renesas/rcar-vin/rcar-v4l2.c | 9 +- + drivers/media/platform/renesas/rcar-vin/rcar-vin.h | 2 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 1 - + drivers/media/platform/ti/davinci/vpif_capture.c | 4 +- + drivers/media/platform/ti/davinci/vpif_display.c | 2 +- + drivers/media/platform/verisilicon/hantro_v4l2.c | 1 + + drivers/media/radio/radio-shark2.c | 2 +- + drivers/media/rc/gpio-ir-recv.c | 1 - + drivers/media/rc/imon.c | 12 +- + drivers/media/rc/ir-spi.c | 41 +- + drivers/media/rc/lirc_dev.c | 18 +- + drivers/media/spi/gs1662.c | 27 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 1 + + drivers/media/test-drivers/vimc/vimc-capture.c | 3 +- + drivers/media/test-drivers/visl/visl-video.c | 1 + + drivers/media/test-drivers/vivid/vivid-core.c | 9 +- + drivers/media/test-drivers/vivid/vivid-meta-out.c | 4 - + drivers/media/test-drivers/vivid/vivid-touch-cap.c | 4 - + drivers/media/usb/dvb-usb-v2/anysee.c | 4 +- + drivers/media/v4l2-core/v4l2-async.c | 12 +- + drivers/media/v4l2-core/v4l2-common.c | 2 + + drivers/media/v4l2-core/v4l2-ctrls-core.c | 3 + + drivers/media/v4l2-core/v4l2-dev.c | 3 + + drivers/media/v4l2-core/v4l2-ioctl.c | 30 ++ + drivers/media/v4l2-core/v4l2-mem2mem.c | 15 + + drivers/media/v4l2-core/v4l2-subdev.c | 41 +- + .../staging/media/atomisp/include/linux/atomisp.h | 24 - + .../media/atomisp/include/linux/atomisp_platform.h | 5 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 12 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 4 - + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 333 +------------- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 95 ++-- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 20 +- + drivers/staging/media/atomisp/pci/sh_css.c | 1 + + drivers/staging/media/imx/Kconfig | 1 - + drivers/staging/media/ipu3/ipu3-css.c | 1 - + drivers/staging/media/ipu3/ipu3.c | 6 +- + drivers/staging/media/starfive/camss/stf-camss.c | 12 +- + drivers/staging/media/tegra-video/tegra20.c | 1 + + drivers/staging/media/tegra-video/vi.c | 12 +- + include/media/media-device.h | 6 + + include/media/v4l2-ioctl.h | 4 + + include/media/v4l2-mem2mem.h | 2 + + include/media/v4l2-subdev.h | 28 +- + include/media/videobuf2-core.h | 52 ++- + include/media/videobuf2-v4l2.h | 2 + + include/uapi/linux/videodev2.h | 17 + + 107 files changed, 1953 insertions(+), 880 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/qcom,sc8280xp-camss.yaml + create mode 100644 Documentation/userspace-api/media/v4l/vidioc-remove-bufs.rst + rename drivers/media/platform/qcom/camss/{camss-vfe-170.c => camss-vfe-17x.c} (100%) +Merging v4l-dvb-next/master (4a7d735191de media: dw2102: fix coding style issues) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'ort' strategy. + .../bindings/media/i2c/galaxycore,gc0308.yaml | 2 +- + .../bindings/media/i2c/galaxycore,gc2145.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx290.yaml | 5 +- + .../devicetree/bindings/media/i2c/sony,imx415.yaml | 2 +- + .../devicetree/bindings/media/nxp,imx8-isi.yaml | 1 + + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 11 + + .../userspace-api/media/cec/cec-func-open.rst | 4 +- + .../userspace-api/media/v4l/func-open.rst | 4 +- + drivers/media/cec/core/cec-core.c | 4 +- + drivers/media/common/videobuf2/videobuf2-core.c | 8 +- + drivers/media/dvb-frontends/as102_fe_types.h | 2 +- + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 2 - + drivers/media/dvb-frontends/drx39xyj/drxj.c | 51 +- + drivers/media/dvb-frontends/m88ds3103.c | 7 + + drivers/media/i2c/Kconfig | 2 + + drivers/media/i2c/adv7180.c | 2 +- + drivers/media/i2c/hi556.c | 105 ++- + drivers/media/i2c/imx219.c | 77 +- + drivers/media/i2c/imx335.c | 641 +++++++------- + drivers/media/i2c/max9271.h | 5 + + drivers/media/i2c/ov2680.c | 97 ++- + drivers/media/i2c/ov4689.c | 675 ++++++++------- + drivers/media/i2c/rdacm20.c | 4 +- + drivers/media/mc/mc-devnode.c | 5 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 9 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 16 +- + drivers/media/pci/ttpci/budget-av.c | 571 ++++++------ + drivers/media/pci/ttpci/budget-ci.c | 495 ++++++----- + drivers/media/pci/ttpci/budget-core.c | 38 +- + drivers/media/pci/ttpci/budget.c | 173 ++-- + drivers/media/pci/ttpci/budget.h | 21 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 26 +- + .../mediatek/vcodec/common/mtk_vcodec_util.c | 23 +- + .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c | 22 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c | 4 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc_pm.h | 2 +- + .../mediatek/vcodec/encoder/venc/venc_h264_if.c | 5 +- + .../platform/mediatek/vcodec/encoder/venc_drv_if.c | 5 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 34 +- + drivers/media/platform/st/sti/c8sectpfe/Kconfig | 1 - + drivers/media/platform/st/sti/c8sectpfe/Makefile | 7 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 2 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-debugfs.h | 5 + + drivers/media/platform/st/sti/hva/hva-hw.c | 3 +- + .../media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 5 +- + drivers/media/spi/cxd2880-spi.c | 2 +- + drivers/media/tuners/xc5000.c | 39 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 18 +- + drivers/media/usb/dvb-usb/dw2102.c | 462 +++++----- + drivers/media/usb/siano/smsusb.c | 20 +- + drivers/media/usb/stk1160/stk1160-video.c | 20 +- + drivers/media/usb/uvc/uvc_driver.c | 54 +- + drivers/media/usb/uvc/uvcvideo.h | 2 + + drivers/media/v4l2-core/v4l2-async.c | 10 +- + drivers/media/v4l2-core/v4l2-ctrls-api.c | 33 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 3 + + drivers/media/v4l2-core/v4l2-dev.c | 3 + + drivers/media/v4l2-core/v4l2-device.c | 12 +- + drivers/media/v4l2-core/v4l2-i2c.c | 2 +- + drivers/media/v4l2-core/v4l2-spi.c | 2 +- + drivers/media/v4l2-core/v4l2-subdev.c | 22 +- + drivers/staging/media/atomisp/Makefile | 1 - + drivers/staging/media/atomisp/i2c/Kconfig | 15 - + drivers/staging/media/atomisp/i2c/Makefile | 5 - + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 955 --------------------- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 14 +- + drivers/staging/media/atomisp/i2c/ov2722.h | 1 - + .../staging/media/atomisp/include/linux/atomisp.h | 57 -- + .../atomisp/include/linux/atomisp_gmin_platform.h | 6 +- + .../media/atomisp/include/linux/atomisp_platform.h | 40 +- + .../staging/media/atomisp/include/media/lm3554.h | 132 --- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 271 +++--- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 13 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 31 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 26 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 49 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 123 +-- + .../staging/media/atomisp/pci/atomisp_internal.h | 15 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 164 +--- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 53 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 17 +- + drivers/staging/media/atomisp/pci/atomisp_tpg.c | 164 ---- + drivers/staging/media/atomisp/pci/atomisp_tpg.h | 39 - + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 165 ++-- + drivers/staging/media/atomisp/pci/bits.h | 4 +- + drivers/staging/media/atomisp/pci/defs.h | 37 - + .../pci/hive_isp_css_common/host/dma_local.h | 1 - + .../pci/hive_isp_css_common/host/input_system.c | 38 - + drivers/staging/media/atomisp/pci/hive_types.h | 19 - + drivers/staging/media/atomisp/pci/ia_css.h | 1 - + .../media/atomisp/pci/ia_css_frame_public.h | 8 - + .../media/atomisp/pci/ia_css_stream_public.h | 17 - + drivers/staging/media/atomisp/pci/ia_css_tpg.h | 79 -- + .../atomisp/pci/isp2400_input_system_global.h | 1 - + .../atomisp/pci/isp2400_input_system_public.h | 15 - + .../atomisp/pci/isp2401_input_system_global.h | 1 - + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 20 +- + .../media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 11 - + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 28 +- + drivers/staging/media/atomisp/pci/sh_css.c | 137 +-- + .../staging/media/atomisp/pci/sh_css_internal.h | 1 - + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 2 +- + drivers/staging/media/atomisp/pci/sh_css_sp.c | 127 ++- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 7 - + drivers/staging/media/atomisp/pci/system_global.h | 12 - + drivers/staging/media/ipu3/ipu3-css-fw.c | 4 +- + drivers/staging/media/ipu3/ipu3-css-fw.h | 2 + + include/media/v4l2-async.h | 4 +- + include/media/v4l2-device.h | 7 +- + include/uapi/linux/dvb/frontend.h | 2 +- + include/uapi/linux/videodev2.h | 2 +- + 114 files changed, 2495 insertions(+), 4343 deletions(-) + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-lm3554.c + delete mode 100644 drivers/staging/media/atomisp/include/media/lm3554.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_tpg.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_tpg.h + delete mode 100644 drivers/staging/media/atomisp/pci/defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/ia_css_tpg.h +Merging pm/linux-next (92af2d44b4c3 Merge branch 'thermal-core' 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 include/acpi/acpi_bus.h +Merge made by the 'ort' strategy. + Documentation/firmware-guide/acpi/namespace.rst | 4 +- + Documentation/power/pci.rst | 2 +- + drivers/acpi/Kconfig | 3 + + drivers/acpi/Makefile | 8 +- + drivers/acpi/acpica/Makefile | 1 + + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acobject.h | 107 ++++-- + drivers/acpi/acpica/evgpeinit.c | 1 + + drivers/acpi/acpica/utdebug.c | 5 + + drivers/acpi/apei/einj-core.c | 12 +- + drivers/acpi/bus.c | 14 +- + drivers/acpi/dock.c | 48 +-- + drivers/acpi/dptf/dptf_pch_fivr.c | 1 + + drivers/acpi/dptf/dptf_power.c | 2 + + drivers/acpi/dptf/int340x_thermal.c | 6 + + drivers/acpi/fan.h | 1 + + drivers/acpi/internal.h | 3 +- + drivers/acpi/nhlt.c | 289 ++++++++++++++ + drivers/acpi/property.c | 11 +- + drivers/acpi/resource.c | 18 + + drivers/acpi/scan.c | 28 +- + drivers/acpi/x86/Makefile | 8 + + drivers/acpi/{ => x86}/blacklist.c | 2 +- + drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +- + drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 5 +- + drivers/acpi/x86/utils.c | 29 +- + drivers/base/power/main.c | 6 +- + drivers/base/power/wakeup.c | 11 +- + drivers/cpufreq/cpufreq.c | 11 +- + drivers/cpufreq/freq_table.c | 8 +- + drivers/cpufreq/intel_pstate.c | 179 ++++----- + drivers/input/misc/atlas_btns.c | 1 - + drivers/mmc/host/sdhci-pci-core.c | 2 +- + drivers/net/fjes/fjes_main.c | 1 - + drivers/opp/of.c | 17 +- + drivers/platform/chrome/wilco_ec/event.c | 1 - + drivers/platform/x86/asus-laptop.c | 1 - + drivers/platform/x86/classmate-laptop.c | 5 - + drivers/platform/x86/dell/dell-rbtn.c | 1 - + drivers/platform/x86/eeepc-laptop.c | 1 - + drivers/platform/x86/intel/rst.c | 1 - + drivers/platform/x86/intel/smartconnect.c | 1 - + drivers/platform/x86/lg-laptop.c | 1 - + drivers/platform/x86/sony-laptop.c | 2 - + drivers/platform/x86/toshiba_acpi.c | 1 - + drivers/platform/x86/toshiba_bluetooth.c | 1 - + drivers/platform/x86/toshiba_haps.c | 1 - + drivers/platform/x86/wireless-hotkey.c | 1 - + drivers/pnp/isapnp/Kconfig | 2 +- + drivers/powercap/dtpm_cpu.c | 8 +- + drivers/powercap/intel_rapl_common.c | 29 +- + drivers/ptp/ptp_vmw.c | 1 - + drivers/soc/samsung/exynos-asv.c | 10 +- + drivers/thermal/gov_bang_bang.c | 97 ++--- + drivers/thermal/gov_fair_share.c | 82 ++-- + drivers/thermal/gov_power_allocator.c | 37 +- + drivers/thermal/gov_step_wise.c | 100 +++-- + drivers/thermal/gov_user_space.c | 10 +- + .../intel/int340x_thermal/acpi_thermal_rel.c | 4 +- + .../intel/int340x_thermal/int3400_thermal.c | 1 + + .../intel/int340x_thermal/int3403_thermal.c | 1 + + drivers/thermal/intel/intel_hfi.c | 97 ++++- + drivers/thermal/thermal_core.c | 160 +++++--- + drivers/thermal/thermal_core.h | 121 +++++- + drivers/thermal/thermal_debugfs.c | 117 ++++-- + drivers/thermal/thermal_debugfs.h | 4 +- + drivers/thermal/thermal_helpers.c | 8 +- + drivers/thermal/thermal_netlink.c | 68 +++- + drivers/thermal/thermal_netlink.h | 26 ++ + drivers/thermal/thermal_sysfs.c | 20 +- + drivers/thermal/thermal_trace.h | 2 + + drivers/thermal/thermal_trace_ipa.h | 2 + + drivers/thermal/thermal_trip.c | 15 +- + drivers/virt/vmgenid.c | 1 - + include/acpi/acpi_bus.h | 36 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 8 +- + include/acpi/actbl2.h | 428 ++++++++++++--------- + include/acpi/actbl3.h | 18 +- + include/acpi/nhlt.h | 181 +++++++++ + include/linux/acpi.h | 8 +- + include/linux/energy_model.h | 5 + + include/linux/pm_opp.h | 8 + + include/linux/pm_wakeup.h | 12 +- + include/linux/thermal.h | 109 +----- + kernel/power/energy_model.c | 106 ++++- + tools/power/acpi/tools/pfrut/pfrut.c | 2 + + 87 files changed, 1867 insertions(+), 945 deletions(-) + create mode 100644 drivers/acpi/nhlt.c + create mode 100644 drivers/acpi/x86/Makefile + rename drivers/acpi/{ => x86}/blacklist.c (99%) + rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%) + rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%) + create mode 100644 include/acpi/nhlt.h +Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles) +$ 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 arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +Auto-merging arch/arm64/boot/dts/allwinner/sun50i-h618-transpeed-8k618-t.dts +Merge made by the 'ort' strategy. + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 2 + + .../opp/allwinner,sun50i-h6-operating-points.yaml | 93 +++++---- + .../dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 5 + + .../boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi | 115 ++++++++++++ + .../dts/allwinner/sun50i-h616-orangepi-zero2.dts | 5 + + .../boot/dts/allwinner/sun50i-h616-x96-mate.dts | 5 + + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 8 + + .../allwinner/sun50i-h618-longan-module-3h.dtsi | 5 + + .../dts/allwinner/sun50i-h618-orangepi-zero2w.dts | 5 + + .../dts/allwinner/sun50i-h618-orangepi-zero3.dts | 5 + + .../allwinner/sun50i-h618-transpeed-8k618-t.dts | 5 + + drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 +- + drivers/cpufreq/cppc_cpufreq.c | 14 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 10 +- + drivers/cpufreq/cpufreq-dt.c | 21 +-- + drivers/cpufreq/mediatek-cpufreq.c | 10 + + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 209 +++++++++++++++++---- + drivers/cpufreq/tegra124-cpufreq.c | 19 +- + drivers/cpufreq/ti-cpufreq.c | 4 +- + drivers/firmware/smccc/smccc.c | 1 + + 20 files changed, 423 insertions(+), 123 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi +Merging cpupower/cpupower (4cece7649650 Linux 6.9-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 (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void) +$ 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 'ort' strategy. + drivers/devfreq/event/exynos-nocp.c | 6 ++---- + drivers/devfreq/event/exynos-ppmu.c | 6 ++---- + drivers/devfreq/mtk-cci-devfreq.c | 6 ++---- + drivers/devfreq/rk3399_dmc.c | 6 ++---- + drivers/devfreq/sun8i-a33-mbus.c | 6 ++---- + 5 files changed, 10 insertions(+), 20 deletions(-) +Merging pmdomain/next (0cebf7cb2d70 pmdomain: core: Don't clear suspended_count at genpd_prepare()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + drivers/cpuidle/cpuidle-psci-domain.c | 3 +- + drivers/cpuidle/cpuidle-psci.c | 5 +- + drivers/cpuidle/cpuidle-psci.h | 20 ------- + drivers/pmdomain/core.c | 11 ++-- + drivers/pmdomain/mediatek/mt8188-pm-domains.h | 14 ++++- + drivers/pmdomain/mediatek/mtk-scpsys.c | 1 - + drivers/pmdomain/renesas/Makefile | 4 +- + drivers/pmdomain/renesas/r8a77960-sysc.c | 49 +++++++++++++++ + .../renesas/{r8a7796-sysc.c => r8a77961-sysc.c} | 28 ++------- + drivers/pmdomain/renesas/rcar-sysc.c | 70 +++++++++------------- + drivers/pmdomain/renesas/rcar-sysc.h | 9 +-- + 12 files changed, 108 insertions(+), 108 deletions(-) + create mode 100644 drivers/pmdomain/renesas/r8a77960-sysc.c + rename drivers/pmdomain/renesas/{r8a7796-sysc.c => r8a77961-sysc.c} (69%) +Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1) +$ 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 +Already up to date. +Merging thermal/thermal/linux-next (734b5def91b5 thermal/drivers/loongson2: Add Loongson-2K2000 support) +$ 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 +Merge made by the 'ort' strategy. + .../bindings/thermal/amlogic,thermal.yaml | 12 +- + .../bindings/thermal/loongson,ls2k-thermal.yaml | 24 +- + .../bindings/thermal/mediatek,lvts-thermal.yaml | 6 + + .../devicetree/bindings/thermal/qcom-lmh.yaml | 12 +- + .../bindings/thermal/st,stih407-thermal.yaml | 58 +++ + .../devicetree/bindings/thermal/st-thermal.txt | 32 -- + drivers/thermal/amlogic_thermal.c | 10 + + drivers/thermal/armada_thermal.c | 9 +- + drivers/thermal/k3_bandgap.c | 1 - + drivers/thermal/loongson2_thermal.c | 121 ++++-- + drivers/thermal/mediatek/lvts_thermal.c | 438 +++++++++++++++------ + drivers/thermal/qcom/lmh.c | 3 + + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 1 - + drivers/thermal/qcom/tsens-v2.c | 1 + + drivers/thermal/qcom/tsens.c | 33 +- + drivers/thermal/qcom/tsens.h | 5 + + drivers/thermal/rcar_gen3_thermal.c | 165 ++++---- + .../dt-bindings/thermal/mediatek,lvts-thermal.h | 26 ++ + 18 files changed, 669 insertions(+), 288 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/st,stih407-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/st-thermal.txt +Merging dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/ast.c | 216 ++++----- + fs/dlm/ast.h | 13 +- + fs/dlm/config.c | 8 + + fs/dlm/config.h | 2 + + fs/dlm/debug_fs.c | 323 +++----------- + fs/dlm/dir.c | 157 +++++-- + fs/dlm/dir.h | 3 +- + fs/dlm/dlm_internal.h | 129 +++--- + fs/dlm/lock.c | 1068 +++++++++++++++++++++++++------------------- + fs/dlm/lock.h | 12 +- + fs/dlm/lockspace.c | 212 +++------ + fs/dlm/lowcomms.c | 62 +-- + fs/dlm/lowcomms.h | 5 +- + fs/dlm/member.c | 25 +- + fs/dlm/memory.c | 18 +- + fs/dlm/memory.h | 4 +- + fs/dlm/midcomms.c | 67 ++- + fs/dlm/midcomms.h | 3 +- + fs/dlm/rcom.c | 33 +- + fs/dlm/recover.c | 149 ++---- + fs/dlm/recover.h | 10 +- + fs/dlm/recoverd.c | 142 ++++-- + fs/dlm/requestqueue.c | 43 +- + fs/dlm/user.c | 135 ++---- + include/trace/events/dlm.h | 46 +- + 25 files changed, 1379 insertions(+), 1506 deletions(-) +Merging rdma/for-next (f88320b698ad RDMA/mana_ib: Fix missing ret value) +$ 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 arch/x86/include/asm/io.h +Auto-merging drivers/net/ethernet/microsoft/mana/mana_en.c +Auto-merging include/linux/io.h +Auto-merging include/net/mana/mana.h +Merge made by the 'ort' strategy. + arch/arm64/include/asm/io.h | 132 +++++++++++++ + arch/arm64/kernel/io.c | 42 ++++ + arch/s390/include/asm/io.h | 15 ++ + arch/s390/pci/pci.c | 6 - + arch/x86/include/asm/io.h | 17 ++ + arch/x86/lib/Makefile | 1 - + arch/x86/lib/iomap_copy_64.S | 15 -- + drivers/infiniband/core/restrack.c | 51 +---- + drivers/infiniband/core/user_mad.c | 21 +- + drivers/infiniband/hw/erdma/erdma.h | 13 +- + drivers/infiniband/hw/erdma/erdma_cmdq.c | 99 +++++----- + drivers/infiniband/hw/erdma/erdma_cq.c | 2 +- + drivers/infiniband/hw/erdma/erdma_eq.c | 54 +++--- + drivers/infiniband/hw/erdma/erdma_hw.h | 6 +- + drivers/infiniband/hw/erdma/erdma_main.c | 15 +- + drivers/infiniband/hw/erdma/erdma_qp.c | 4 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 105 +++++----- + drivers/infiniband/hw/erdma/erdma_verbs.h | 16 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 31 ++- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 25 +-- + drivers/infiniband/hw/hns/hns_roce_device.h | 14 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 17 +- + drivers/infiniband/hw/hns/hns_roce_hem.h | 12 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 154 ++++++++++----- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 15 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 32 +++- + drivers/infiniband/hw/hns/hns_roce_mr.c | 19 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 29 ++- + drivers/infiniband/hw/hns/hns_roce_srq.c | 12 +- + drivers/infiniband/hw/mana/cq.c | 59 ++---- + drivers/infiniband/hw/mana/device.c | 51 ++++- + drivers/infiniband/hw/mana/main.c | 244 +++++++++++++++++++++++- + drivers/infiniband/hw/mana/mana_ib.h | 113 +++++++++-- + drivers/infiniband/hw/mana/mr.c | 2 +- + drivers/infiniband/hw/mana/qp.c | 106 ++++------ + drivers/infiniband/hw/mana/wq.c | 31 +-- + drivers/infiniband/hw/mlx5/mem.c | 8 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 +- + drivers/infiniband/hw/mlx5/mr.c | 35 ++-- + drivers/infiniband/sw/rxe/rxe_comp.c | 32 ++-- + drivers/infiniband/sw/rxe/rxe_hw_counters.c | 2 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.h | 2 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 3 +- + drivers/infiniband/sw/rxe/rxe_net.c | 69 ++++--- + drivers/infiniband/sw/rxe/rxe_pool.c | 4 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 46 ++--- + drivers/infiniband/sw/rxe/rxe_req.c | 82 +++----- + drivers/infiniband/sw/rxe/rxe_resp.c | 14 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 17 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 7 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 - + drivers/net/ethernet/microsoft/mana/mana_en.c | 14 +- + include/linux/io.h | 8 +- + include/net/mana/mana.h | 1 + + include/uapi/rdma/hns-abi.h | 9 +- + lib/iomap_copy.c | 13 +- + 57 files changed, 1263 insertions(+), 693 deletions(-) + delete mode 100644 arch/x86/lib/iomap_copy_64.S +Merging net-next/main (89de2db19317 Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging Documentation/devicetree/bindings/net/stm32-dwmac.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/net/bpf_jit_32.c +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/riscv/net/bpf_jit_comp64.c +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/vxlan/vxlan_core.c +Auto-merging drivers/net/wireless/ath/ath10k/pci.c +Auto-merging drivers/net/wireless/realtek/rtw89/pci.c +Auto-merging drivers/of/property.c +CONFLICT (content): Merge conflict in drivers/of/property.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Auto-merging include/linux/bitops.h +Auto-merging include/linux/bpf.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/filter.h +CONFLICT (content): Merge conflict in include/linux/filter.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/skmsg.h +Auto-merging include/linux/slab.h +CONFLICT (content): Merge conflict in include/linux/slab.h +Auto-merging include/net/netlink.h +Auto-merging include/net/request_sock.h +Auto-merging ipc/ipc_sysctl.c +Auto-merging ipc/mq_sysctl.c +Auto-merging kernel/bpf/arena.c +Auto-merging kernel/bpf/core.c +CONFLICT (content): Merge conflict in kernel/bpf/core.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/verifier.c +Auto-merging net/core/filter.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging scripts/kernel-doc +Auto-merging tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +Auto-merging tools/testing/selftests/lib.mk +Resolved 'drivers/of/property.c' using previous resolution. +Resolved 'include/linux/filter.h' using previous resolution. +Resolved 'include/linux/slab.h' using previous resolution. +Resolved 'kernel/bpf/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master caacb2666b21] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + .../bpf/standardization/instruction-set.rst | 109 +- + Documentation/conf.py | 2 + + .../devicetree/bindings/net/airoha,en8811h.yaml | 56 + + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 4 + + .../bindings/net/pse-pd/microchip,pd692x0.yaml | 169 ++ + .../bindings/net/pse-pd/pse-controller.yaml | 101 +- + .../bindings/net/pse-pd/ti,tps23881.yaml | 95 + + .../devicetree/bindings/net/renesas,etheravb.yaml | 12 +- + .../devicetree/bindings/net/renesas,ethertsn.yaml | 33 +- + .../devicetree/bindings/net/rockchip-dwmac.yaml | 4 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 6 +- + .../bindings/net/starfive,jh7110-dwmac.yaml | 26 +- + .../devicetree/bindings/net/stm32-dwmac.yaml | 7 + + .../devicetree/bindings/net/ti,icssg-prueth.yaml | 35 +- + .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 1 + + Documentation/mm/page_frags.rst | 2 +- + Documentation/netlink/genetlink-c.yaml | 2 +- + Documentation/netlink/genetlink-legacy.yaml | 2 +- + Documentation/netlink/genetlink.yaml | 2 +- + Documentation/netlink/netlink-raw.yaml | 2 +- + Documentation/netlink/specs/ethtool.yaml | 55 +- + Documentation/netlink/specs/netdev.yaml | 1 + + Documentation/netlink/specs/nftables.yaml | 1264 +++++++++++ + Documentation/netlink/specs/nlctrl.yaml | 6 +- + Documentation/netlink/specs/rt_link.yaml | 246 ++- + Documentation/netlink/specs/tc.yaml | 72 +- + Documentation/netlink/specs/team.yaml | 204 ++ + .../ethernet/mellanox/mlx5/counters.rst | 11 + + Documentation/networking/devlink/devlink-info.rst | 5 + + Documentation/networking/devlink/devlink-port.rst | 33 + + Documentation/networking/devlink/hns3.rst | 5 + + Documentation/networking/devlink/ice.rst | 47 + + Documentation/networking/devlink/nfp.rst | 5 +- + Documentation/networking/dns_resolver.rst | 4 +- + Documentation/networking/ethtool-netlink.rst | 36 + + Documentation/networking/index.rst | 1 + + Documentation/networking/pse-pd/index.rst | 10 + + Documentation/networking/pse-pd/introduction.rst | 73 + + Documentation/networking/pse-pd/pse-pi.rst | 301 +++ + Documentation/translations/zh_CN/mm/page_frags.rst | 2 +- + .../userspace-api/netlink/genetlink-legacy.rst | 22 +- + MAINTAINERS | 41 + + arch/arm/net/bpf_jit_32.c | 25 +- + arch/arm64/net/bpf_jit_comp.c | 93 +- + arch/loongarch/net/bpf_jit.c | 22 +- + arch/mips/net/bpf_jit_comp.c | 3 +- + arch/parisc/net/bpf_jit_core.c | 8 +- + arch/riscv/net/bpf_jit.h | 2 + + arch/riscv/net/bpf_jit_comp64.c | 203 +- + arch/riscv/net/bpf_jit_core.c | 2 + + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/sparc/net/bpf_jit_comp_64.c | 6 +- + arch/x86/net/bpf_jit_comp.c | 102 +- + arch/x86/net/bpf_jit_comp32.c | 3 +- + crypto/Makefile | 3 + + crypto/af_alg.c | 4 +- + crypto/bpf_crypto_skcipher.c | 82 + + drivers/bcma/host_soc.c | 6 +- + .../crypto/marvell/octeontx2/otx2_cpt_devlink.c | 9 +- + drivers/infiniband/core/addr.c | 6 +- + drivers/infiniband/hw/irdma/cm.c | 3 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 3 +- + drivers/isdn/capi/Makefile | 3 +- + drivers/isdn/capi/kcapi.c | 7 +- + drivers/md/dm-clone-metadata.c | 5 - + drivers/net/Kconfig | 16 +- + drivers/net/Makefile | 1 + + drivers/net/arcnet/Kconfig | 2 +- + drivers/net/arcnet/arcdevice.h | 3 +- + drivers/net/arcnet/arcnet.c | 11 +- + drivers/net/bareudp.c | 19 +- + drivers/net/bonding/bond_main.c | 10 +- + drivers/net/bonding/bond_netlink.c | 3 +- + drivers/net/bonding/bond_options.c | 2 +- + drivers/net/bonding/bond_procfs.c | 2 +- + drivers/net/bonding/bond_sysfs.c | 25 +- + drivers/net/bonding/bond_sysfs_slave.c | 2 +- + drivers/net/can/cc770/Kconfig | 1 + + drivers/net/can/sja1000/Kconfig | 1 + + drivers/net/dsa/b53/b53_common.c | 212 +- + drivers/net/dsa/b53/b53_priv.h | 12 - + drivers/net/dsa/bcm_sf2.c | 49 +- + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 25 +- + drivers/net/dsa/lan9303-core.c | 38 +- + drivers/net/dsa/lantiq_gswip.c | 39 +- + drivers/net/dsa/microchip/ksz8.h | 2 - + drivers/net/dsa/microchip/ksz8795.c | 135 +- + drivers/net/dsa/microchip/ksz8795_reg.h | 1 + + drivers/net/dsa/microchip/ksz9477_tc_flower.c | 3 + + drivers/net/dsa/microchip/ksz_spi.c | 8 - + drivers/net/dsa/mt7530-mdio.c | 28 +- + drivers/net/dsa/mt7530.c | 475 ++-- + drivers/net/dsa/mt7530.h | 279 +-- + drivers/net/dsa/mv88e6xxx/chip.c | 113 +- + drivers/net/dsa/mv88e6xxx/chip.h | 6 + + drivers/net/dsa/mv88e6xxx/global1.c | 89 + + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 3 + + drivers/net/dsa/qca/ar9331.c | 37 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 49 +- + drivers/net/dsa/realtek/rtl8366rb.c | 363 +++- + drivers/net/dsa/realtek/rtl83xx.c | 7 +- + drivers/net/dsa/rzn1_a5psw.c | 47 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 3 + + drivers/net/dsa/sja1105/sja1105_main.c | 39 +- + drivers/net/dsa/vitesse-vsc73xx-core.c | 263 ++- + drivers/net/dsa/vitesse-vsc73xx.h | 27 +- + drivers/net/dsa/xrs700x/xrs700x.c | 26 +- + drivers/net/ethernet/3com/3c515.c | 3 - + drivers/net/ethernet/3com/Kconfig | 4 +- + drivers/net/ethernet/8390/Kconfig | 6 +- + drivers/net/ethernet/amd/Kconfig | 4 +- + drivers/net/ethernet/amd/amd8111e.c | 1 - + drivers/net/ethernet/amd/amd8111e.h | 1 - + drivers/net/ethernet/amd/pds_core/core.h | 3 +- + drivers/net/ethernet/amd/pds_core/devlink.c | 3 +- + drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 8 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 570 +++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 40 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 226 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 184 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 30 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 5 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 4 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 149 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 14 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 30 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 2 +- + drivers/net/ethernet/broadcom/cnic.c | 3 +- + drivers/net/ethernet/broadcom/tg3.c | 30 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 67 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 2 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 3 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 20 +- + drivers/net/ethernet/cisco/enic/vnic_dev.h | 5 + + drivers/net/ethernet/emulex/benet/be_main.c | 5 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- + .../ethernet/freescale/dpaa2/dpaa2-switch-flower.c | 6 + + drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 1 - + drivers/net/ethernet/freescale/fman/fman_muram.c | 1 - + drivers/net/ethernet/fujitsu/Kconfig | 2 +- + drivers/net/ethernet/google/gve/gve.h | 68 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 146 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 48 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 82 +- + drivers/net/ethernet/google/gve/gve_main.c | 68 +- + drivers/net/ethernet/google/gve/gve_rx.c | 14 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 19 +- + drivers/net/ethernet/google/gve/gve_tx.c | 12 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 15 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 13 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 19 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 24 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 646 +++++- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 643 +----- + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 44 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.h | 2 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 433 +++- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 36 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 81 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 1 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_trace.h | 94 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 40 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h | 50 + + drivers/net/ethernet/ibm/emac/mal.c | 14 +- + drivers/net/ethernet/ibm/emac/mal.h | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 10 +- + drivers/net/ethernet/intel/Kconfig | 9 +- + drivers/net/ethernet/intel/Makefile | 3 + + drivers/net/ethernet/intel/e100.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 14 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 62 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 22 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 253 --- + drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 1160 +++++----- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 7 - + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 76 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 88 - + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 3 +- + drivers/net/ethernet/intel/iavf/iavf.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 253 --- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 140 -- + drivers/net/ethernet/intel/iavf/iavf_main.c | 48 +- + drivers/net/ethernet/intel/iavf/iavf_prototype.h | 7 - + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 551 +---- + drivers/net/ethernet/intel/iavf/iavf_txrx.h | 146 +- + drivers/net/ethernet/intel/iavf/iavf_type.h | 90 - + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 17 +- + drivers/net/ethernet/intel/ice/Makefile | 7 +- + .../intel/ice/{ice_devlink.c => devlink/devlink.c} | 569 ++--- + .../intel/ice/{ice_devlink.h => devlink/devlink.h} | 0 + .../net/ethernet/intel/ice/devlink/devlink_port.c | 430 ++++ + .../net/ethernet/intel/ice/devlink/devlink_port.h | 12 + + drivers/net/ethernet/intel/ice/ice.h | 12 +- + drivers/net/ethernet/intel/ice/ice_adapter.c | 116 + + drivers/net/ethernet/intel/ice/ice_adapter.h | 28 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 34 + + drivers/net/ethernet/intel/ice/ice_base.c | 47 +- + drivers/net/ethernet/intel/ice/ice_common.c | 7 + + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 6 +- + drivers/net/ethernet/intel/ice/ice_ddp.c | 218 ++ + drivers/net/ethernet/intel/ice/ice_ddp.h | 2 + + drivers/net/ethernet/intel/ice/ice_eswitch.c | 364 +--- + drivers/net/ethernet/intel/ice/ice_eswitch.h | 13 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 140 +- + drivers/net/ethernet/intel/ice/ice_fdir.c | 111 +- + drivers/net/ethernet/intel/ice/ice_fdir.h | 5 + + drivers/net/ethernet/intel/ice/ice_flex_type.h | 4 +- + drivers/net/ethernet/intel/ice/ice_fw_update.c | 7 +- + drivers/net/ethernet/intel/ice/ice_fw_update.h | 3 + + drivers/net/ethernet/intel/ice/ice_lag.c | 53 +- + drivers/net/ethernet/intel/ice/ice_lag.h | 3 +- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 320 --- + drivers/net/ethernet/intel/ice/ice_lib.c | 50 +- + drivers/net/ethernet/intel/ice/ice_main.c | 215 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 7 +- + drivers/net/ethernet/intel/ice/ice_nvm.h | 3 + + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 12 + + drivers/net/ethernet/intel/ice/ice_ptp.c | 33 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 3 + + drivers/net/ethernet/intel/ice/ice_repr.c | 135 +- + drivers/net/ethernet/intel/ice/ice_repr.h | 24 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 37 +- + drivers/net/ethernet/intel/ice/ice_sched.h | 11 + + drivers/net/ethernet/intel/ice/ice_sriov.c | 40 +- + drivers/net/ethernet/intel/ice/ice_sriov.h | 7 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 276 ++- + drivers/net/ethernet/intel/ice/ice_switch.h | 8 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 68 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 8 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 3 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 1 + + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 122 +- + drivers/net/ethernet/intel/ice/ice_type.h | 5 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 5 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 14 +- + drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c | 1 - + drivers/net/ethernet/intel/ice/ice_xsk.c | 3 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 5 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.h | 2 + + drivers/net/ethernet/intel/idpf/virtchnl2.h | 24 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 15 - + drivers/net/ethernet/intel/igb/igb_main.c | 59 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 6 +- + drivers/net/ethernet/intel/igc/igc.h | 71 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 17 - + drivers/net/ethernet/intel/igc/igc_main.c | 172 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 51 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 19 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 3 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 8 +- + drivers/net/ethernet/intel/libeth/Kconfig | 9 + + drivers/net/ethernet/intel/libeth/Makefile | 6 + + drivers/net/ethernet/intel/libeth/rx.c | 150 ++ + drivers/net/ethernet/intel/libie/Kconfig | 10 + + drivers/net/ethernet/intel/libie/Makefile | 6 + + drivers/net/ethernet/intel/libie/rx.c | 124 ++ + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 27 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 1 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 7 +- + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 + + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 3 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 29 + + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 12 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 2 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 28 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 21 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 3 + + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 3 + + .../ethernet/marvell/prestera/prestera_flower.c | 4 + + .../net/ethernet/marvell/prestera/prestera_rxtx.c | 15 +- + drivers/net/ethernet/marvell/sky2.c | 1 + + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 4 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 1 + + drivers/net/ethernet/mellanox/mlx4/main.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 44 +- + .../net/ethernet/mellanox/mlx5/core/en/channels.c | 83 + + .../net/ethernet/mellanox/mlx5/core/en/channels.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/en/dim.h | 45 + + .../net/ethernet/mellanox/mlx5/core/en/params.c | 72 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 5 - + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 50 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 2 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 12 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 8 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h | 4 +- + .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 28 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 14 +- + .../mellanox/mlx5/core/en_accel/ktls_stats.c | 26 +- + .../mellanox/mlx5/core/en_accel/macsec_stats.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 95 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 343 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 213 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 82 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 539 ++--- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 2 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 100 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 252 ++- + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 3 + + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 2 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 530 +++-- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 4 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 3 + + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 3 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 60 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 4 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 56 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 12 +- + drivers/net/ethernet/microchip/encx24j600-regmap.c | 4 +- + drivers/net/ethernet/microchip/encx24j600.c | 7 +- + drivers/net/ethernet/microchip/encx24j600_hw.h | 2 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 21 - + drivers/net/ethernet/microchip/lan743x_main.c | 11 +- + drivers/net/ethernet/microchip/lan743x_ptp.c | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_ifh.h | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 4 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_port.c | 2 +- + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 14 +- + .../net/ethernet/microchip/lan966x/lan966x_vlan.c | 2 +- + drivers/net/ethernet/microchip/sparx5/Makefile | 3 +- + .../net/ethernet/microchip/sparx5/sparx5_fdma.c | 2 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 3 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 25 + + .../ethernet/microchip/sparx5/sparx5_main_regs.h | 68 + + .../net/ethernet/microchip/sparx5/sparx5_mirror.c | 235 ++ + .../net/ethernet/microchip/sparx5/sparx5_packet.c | 2 +- + .../net/ethernet/microchip/sparx5/sparx5_port.c | 2 +- + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 2 +- + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 88 +- + .../ethernet/microchip/sparx5/sparx5_tc_matchall.c | 125 +- + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 2 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 16 +- + .../net/ethernet/microchip/vcap/vcap_api_client.h | 4 +- + .../net/ethernet/microchip/vcap/vcap_api_private.h | 2 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 7 +- + drivers/net/ethernet/netronome/nfp/devlink_param.c | 3 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 27 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 6 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 1 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 5 +- + .../net/ethernet/netronome/nfp/nfp_net_debugdump.c | 41 +- + drivers/net/ethernet/qlogic/qed/qed.h | 2 - + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 12 +- + drivers/net/ethernet/realtek/r8169_main.c | 2 + + drivers/net/ethernet/renesas/ravb_main.c | 9 +- + drivers/net/ethernet/sfc/tc.c | 7 +- + drivers/net/ethernet/sis/Kconfig | 4 +- + drivers/net/ethernet/smsc/Kconfig | 2 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 - + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 56 +- + drivers/net/ethernet/sun/cassini.c | 5 +- + drivers/net/ethernet/ti/Kconfig | 17 +- + drivers/net/ethernet/ti/Makefile | 9 + + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 13 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 702 +++++- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 13 + + drivers/net/ethernet/ti/am65-cpsw-qos.c | 19 +- + drivers/net/ethernet/ti/am65-cpts.c | 107 +- + drivers/net/ethernet/ti/am65-cpts.h | 11 +- + drivers/net/ethernet/ti/cpsw_new.c | 6 +- + drivers/net/ethernet/ti/cpsw_priv.c | 3 + + drivers/net/ethernet/ti/icssg/icssg_classifier.c | 113 +- + drivers/net/ethernet/ti/icssg/icssg_common.c | 1223 +++++++++++ + drivers/net/ethernet/ti/icssg/icssg_config.c | 14 +- + drivers/net/ethernet/ti/icssg/icssg_config.h | 56 + + drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 12 + + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 1191 +---------- + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 79 +- + drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 1181 ++++++++++ + drivers/net/ethernet/ti/k3-cppi-desc-pool.c | 46 +- + drivers/net/ethernet/ti/k3-cppi-desc-pool.h | 6 + + drivers/net/ethernet/via/Kconfig | 1 + + drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 23 +- + drivers/net/ethernet/xircom/Kconfig | 2 +- + drivers/net/fddi/defxx.c | 2 +- + drivers/net/geneve.c | 44 +- + drivers/net/hamradio/Kconfig | 6 +- + drivers/net/ipa/data/ipa_data-v3.1.c | 5 +- + drivers/net/ipa/data/ipa_data-v3.5.1.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.11.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.2.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.5.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.7.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.9.c | 5 +- + drivers/net/ipa/data/ipa_data-v5.0.c | 5 +- + drivers/net/ipa/data/ipa_data-v5.5.c | 5 +- + drivers/net/ipa/gsi.c | 30 +- + drivers/net/ipa/gsi.h | 12 +- + drivers/net/ipa/gsi_private.h | 7 +- + drivers/net/ipa/gsi_reg.c | 6 +- + drivers/net/ipa/gsi_trans.c | 12 +- + drivers/net/ipa/gsi_trans.h | 9 +- + drivers/net/ipa/ipa.h | 15 +- + drivers/net/ipa/ipa_cmd.c | 13 +- + drivers/net/ipa/ipa_cmd.h | 18 +- + drivers/net/ipa/ipa_data.h | 4 +- + drivers/net/ipa/ipa_endpoint.c | 19 +- + drivers/net/ipa/ipa_endpoint.h | 10 +- + drivers/net/ipa/ipa_gsi.c | 7 +- + drivers/net/ipa/ipa_interrupt.c | 56 +- + drivers/net/ipa/ipa_interrupt.h | 6 +- + drivers/net/ipa/ipa_main.c | 45 +- + drivers/net/ipa/ipa_mem.c | 21 +- + drivers/net/ipa/ipa_mem.h | 4 +- + drivers/net/ipa/ipa_modem.c | 18 +- + drivers/net/ipa/ipa_modem.h | 5 +- + drivers/net/ipa/ipa_power.c | 29 +- + drivers/net/ipa/ipa_power.h | 19 +- + drivers/net/ipa/ipa_qmi.c | 10 +- + drivers/net/ipa/ipa_qmi.h | 4 +- + drivers/net/ipa/ipa_qmi_msg.c | 3 +- + drivers/net/ipa/ipa_qmi_msg.h | 3 +- + drivers/net/ipa/ipa_reg.c | 4 +- + drivers/net/ipa/ipa_reg.h | 6 +- + drivers/net/ipa/ipa_resource.c | 3 +- + drivers/net/ipa/ipa_smp2p.c | 10 +- + drivers/net/ipa/ipa_sysfs.c | 7 +- + drivers/net/ipa/ipa_sysfs.h | 4 +- + drivers/net/ipa/ipa_table.c | 29 +- + drivers/net/ipa/ipa_table.h | 7 +- + drivers/net/ipa/ipa_uc.c | 10 +- + drivers/net/ipa/ipa_uc.h | 3 +- + drivers/net/ipa/ipa_version.h | 22 +- + drivers/net/ipa/reg.h | 8 +- + drivers/net/ipa/reg/gsi_reg-v3.1.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v3.5.1.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v4.0.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v4.11.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v4.5.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v4.9.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v5.0.c | 8 +- + drivers/net/ipa/reg/ipa_reg-v3.1.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v4.11.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v4.2.c | 6 +- + drivers/net/ipa/reg/ipa_reg-v4.5.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v4.7.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v4.9.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v5.0.c | 6 +- + drivers/net/ipa/reg/ipa_reg-v5.5.c | 6 +- + drivers/net/ipvlan/ipvlan_main.c | 1 + + drivers/net/mdio/mdio-gpio.c | 3 +- + drivers/net/netdevsim/ethtool.c | 11 + + drivers/net/netdevsim/netdev.c | 142 ++ + drivers/net/netdevsim/netdevsim.h | 4 + + drivers/net/pcs/pcs-rzn1-miic.c | 28 + + drivers/net/pfcp.c | 301 +++ + drivers/net/phy/Kconfig | 5 + + drivers/net/phy/Makefile | 3 +- + drivers/net/phy/air_en8811h.c | 1086 ++++++++++ + drivers/net/phy/aquantia/aquantia_main.c | 21 + + drivers/net/phy/dp83822.c | 37 +- + drivers/net/phy/marvell-88x2222.c | 2 + + drivers/net/phy/marvell.c | 316 +++ + drivers/net/phy/marvell10g.c | 2 + + drivers/net/phy/mediatek-ge.c | 3 - + drivers/net/phy/micrel.c | 563 ++++- + drivers/net/phy/phy_device.c | 55 + + drivers/net/phy/phy_link_topology.c | 105 + + drivers/net/phy/phylink.c | 28 +- + drivers/net/phy/qcom/at803x.c | 5 +- + drivers/net/phy/qcom/qca807x.c | 2 + + drivers/net/phy/realtek.c | 324 ++- + drivers/net/phy/sfp-bus.c | 15 +- + drivers/net/phy/sfp.c | 27 +- + drivers/net/pse-pd/Kconfig | 22 +- + drivers/net/pse-pd/Makefile | 2 + + drivers/net/pse-pd/pd692x0.c | 1223 +++++++++++ + drivers/net/pse-pd/pse_core.c | 529 ++++- + drivers/net/pse-pd/pse_regulator.c | 51 +- + drivers/net/pse-pd/tps23881.c | 820 +++++++ + drivers/net/tap.c | 2 +- + drivers/net/team/Makefile | 1 + + drivers/net/team/{team.c => team_core.c} | 63 +- + drivers/net/team/team_nl.c | 59 + + drivers/net/team/team_nl.h | 29 + + drivers/net/tun.c | 2 +- + drivers/net/usb/ax88179_178a.c | 6 +- + drivers/net/usb/lan78xx.c | 42 +- + drivers/net/usb/qmi_wwan.c | 12 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/usbnet.c | 1 + + drivers/net/veth.c | 3 +- + drivers/net/virtio_net.c | 43 + + drivers/net/vrf.c | 4 +- + drivers/net/vxlan/vxlan_core.c | 16 +- + drivers/net/wan/Kconfig | 2 +- + drivers/net/wan/fsl_qmc_hdlc.c | 6 +- + drivers/net/wireguard/main.c | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 9 +- + drivers/net/wireless/ath/ath10k/core.h | 2 +- + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/ath10k/sdio.c | 2 +- + drivers/net/wireless/ath/ath10k/snoc.c | 4 +- + drivers/net/wireless/ath/ath10k/thermal.c | 2 +- + drivers/net/wireless/ath/ath10k/usb.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 26 +- + drivers/net/wireless/ath/ath11k/Makefile | 3 +- + drivers/net/wireless/ath/ath11k/ahb.c | 9 +- + drivers/net/wireless/ath/ath11k/core.c | 20 +- + drivers/net/wireless/ath/ath11k/core.h | 2 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 4 +- + drivers/net/wireless/ath/ath11k/mac.c | 175 +- + drivers/net/wireless/ath/ath11k/mhi.c | 17 +- + drivers/net/wireless/ath/ath11k/p2p.c | 149 ++ + drivers/net/wireless/ath/ath11k/p2p.h | 22 + + drivers/net/wireless/ath/ath11k/pci.h | 1 + + drivers/net/wireless/ath/ath11k/pcic.c | 21 +- + drivers/net/wireless/ath/ath11k/thermal.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 107 +- + drivers/net/wireless/ath/ath11k/wmi.h | 78 +- + drivers/net/wireless/ath/ath12k/dp.c | 31 +- + drivers/net/wireless/ath/ath12k/dp.h | 7 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 140 +- + drivers/net/wireless/ath/ath12k/dp_rx.h | 1 + + drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +- + drivers/net/wireless/ath/ath12k/wmi.c | 2 +- + drivers/net/wireless/ath/ath12k/wmi.h | 34 - + drivers/net/wireless/ath/ath6kl/htc_mbox.c | 3 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 3 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 4 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 6 +- + drivers/net/wireless/ath/ath9k/pci.c | 2 - + drivers/net/wireless/ath/ath9k/xmit.c | 10 +- + drivers/net/wireless/ath/wcn36xx/main.c | 4 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 4 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 7 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +- + drivers/net/wireless/ath/wil6210/fw.h | 1 - + drivers/net/wireless/ath/wil6210/fw_inc.c | 4 +- + drivers/net/wireless/broadcom/b43/sysfs.c | 13 +- + drivers/net/wireless/broadcom/b43legacy/sysfs.c | 16 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 15 +- + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 2 + + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 36 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 16 + + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 57 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 51 +- + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 74 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 127 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 26 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 5 + + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 23 + + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 24 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 6 - + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 28 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 96 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 12 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 236 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 60 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 94 +- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 567 +++++ + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 195 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 317 +-- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 39 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 176 +- + .../net/wireless/intel/iwlwifi/mvm/offloading.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 67 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 339 ++- + .../net/wireless/intel/iwlwifi/mvm/tests/Makefile | 3 + + .../net/wireless/intel/iwlwifi/mvm/tests/links.c | 394 ++++ + .../net/wireless/intel/iwlwifi/mvm/tests/module.c | 10 + + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 22 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 54 +- + drivers/net/wireless/intel/iwlwifi/tests/devinfo.c | 26 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 3 +- + drivers/net/wireless/marvell/mwl8k.c | 92 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 9 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 41 +- + drivers/net/wireless/microchip/wilc1000/hif.c | 17 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 43 +- + drivers/net/wireless/microchip/wilc1000/netdev.h | 5 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 5 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 5 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 2 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 12 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 6 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 6 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 193 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 22 + + drivers/net/wireless/realtek/rtw88/Makefile | 9 + + drivers/net/wireless/realtek/rtw88/coex.c | 4 +- + drivers/net/wireless/realtek/rtw88/fw.c | 14 +- + drivers/net/wireless/realtek/rtw88/fw.h | 2 + + drivers/net/wireless/realtek/rtw88/mac.c | 6 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 2 + + drivers/net/wireless/realtek/rtw88/main.c | 18 +- + drivers/net/wireless/realtek/rtw88/main.h | 3 + + drivers/net/wireless/realtek/rtw88/rtw8703b.c | 2109 ++++++++++++++++++ + drivers/net/wireless/realtek/rtw88/rtw8703b.h | 102 + + .../net/wireless/realtek/rtw88/rtw8703b_tables.c | 902 ++++++++ + .../net/wireless/realtek/rtw88/rtw8703b_tables.h | 14 + + drivers/net/wireless/realtek/rtw88/rtw8723cs.c | 34 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 673 +----- + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 269 +-- + drivers/net/wireless/realtek/rtw88/rtw8723x.c | 721 +++++++ + drivers/net/wireless/realtek/rtw88/rtw8723x.h | 518 +++++ + drivers/net/wireless/realtek/rtw88/rx.h | 2 + + drivers/net/wireless/realtek/rtw89/Kconfig | 15 + + drivers/net/wireless/realtek/rtw89/Makefile | 12 +- + drivers/net/wireless/realtek/rtw89/coex.c | 964 ++++++++- + drivers/net/wireless/realtek/rtw89/coex.h | 72 + + drivers/net/wireless/realtek/rtw89/core.c | 24 +- + drivers/net/wireless/realtek/rtw89/core.h | 119 +- + drivers/net/wireless/realtek/rtw89/fw.c | 98 +- + drivers/net/wireless/realtek/rtw89/fw.h | 31 +- + drivers/net/wireless/realtek/rtw89/pci.c | 91 + + drivers/net/wireless/realtek/rtw89/pci.h | 13 + + drivers/net/wireless/realtek/rtw89/phy.c | 13 +- + drivers/net/wireless/realtek/rtw89/phy_be.c | 18 + + drivers/net/wireless/realtek/rtw89/reg.h | 4 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8851be.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 90 +- + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 23 + + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 155 ++ + drivers/net/wireless/realtek/rtw89/rtw8922ae.c | 1 + + drivers/net/wireless/rsi/rsi_91x_sdio.c | 31 +- + drivers/net/wireless/ti/wl1251/cmd.h | 2 - + drivers/net/wireless/ti/wl1251/sdio.c | 20 +- + drivers/net/wireless/ti/wl1251/wl12xx_80211.h | 1 - + drivers/net/wireless/ti/wlcore/cmd.h | 2 - + drivers/net/wireless/ti/wlcore/sysfs.c | 11 +- + drivers/net/wireless/ti/wlcore/wl12xx_80211.h | 1 - + drivers/net/wireless/virtual/mac80211_hwsim.c | 46 +- + drivers/net/wwan/iosm/iosm_ipc_devlink.c | 3 +- + drivers/net/wwan/mhi_wwan_mbim.c | 1 - + drivers/net/wwan/t7xx/t7xx_netdev.c | 20 +- + drivers/net/wwan/t7xx/t7xx_netdev.h | 2 +- + drivers/net/xen-netback/common.h | 5 +- + drivers/net/xen-netback/interface.c | 2 +- + drivers/net/xen-netback/netback.c | 12 +- + drivers/nfc/nfcmrvl/spi.c | 1 - + drivers/nfc/st95hf/core.c | 28 +- + drivers/of/property.c | 2 + + drivers/ptp/ptp_clockmatrix.c | 6 +- + drivers/ptp/ptp_dte.c | 6 +- + drivers/ptp/ptp_idt82p33.c | 6 +- + drivers/ptp/ptp_ines.c | 5 +- + drivers/ptp/ptp_qoriq.c | 5 +- + drivers/s390/cio/idset.c | 12 +- + drivers/s390/net/qeth_core.h | 4 +- + drivers/ssb/main.c | 6 +- + drivers/vhost/net.c | 8 +- + drivers/virtio/Kconfig | 10 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio.c | 8 + + drivers/virtio/virtio_debug.c | 114 + + fs/btrfs/free-space-cache.c | 8 +- + fs/ntfs3/bitmap.c | 4 +- + fs/ntfs3/fsntfs.c | 2 +- + fs/ntfs3/index.c | 11 +- + fs/ntfs3/ntfs_fs.h | 4 +- + fs/ntfs3/super.c | 2 +- + include/linux/bitmap.h | 91 +- + include/linux/bitops.h | 23 +- + include/linux/bpf.h | 31 +- + include/linux/bpf_crypto.h | 24 + + include/linux/bpf_verifier.h | 11 +- + include/linux/compiler_types.h | 11 + + include/linux/cpumask.h | 2 +- + include/linux/dynamic_queue_limits.h | 50 +- + include/linux/etherdevice.h | 12 +- + include/linux/ethtool.h | 27 +- + include/linux/filter.h | 50 +- + include/linux/genetlink.h | 19 - + include/linux/genl_magic_struct.h | 2 +- + include/linux/ieee80211.h | 30 +- + include/linux/linkmode.h | 27 +- + include/linux/marvell_phy.h | 1 + + include/linux/mlx5/cq.h | 7 +- + include/linux/mlx5/device.h | 8 +- + include/linux/mlx5/mlx5_ifc.h | 63 +- + include/linux/mmc/sdio_ids.h | 1 + + include/linux/net/intel/libie/rx.h | 50 + + include/linux/netdevice.h | 53 +- + include/linux/phy.h | 7 + + include/linux/phy_link_topology.h | 72 + + include/linux/phy_link_topology_core.h | 25 + + include/linux/phylink.h | 42 + + include/linux/pse-pd/pse.h | 83 +- + include/linux/rhashtable.h | 10 +- + include/linux/rtnetlink.h | 3 + + include/linux/sfp.h | 8 +- + include/linux/skbuff.h | 125 +- + include/linux/skbuff_ref.h | 106 + + include/linux/skmsg.h | 4 + + include/linux/slab.h | 22 +- + include/linux/ssb/ssb.h | 8 - + include/linux/sysctl.h | 2 +- + include/linux/tcp.h | 6 +- + include/linux/trace_events.h | 36 +- + include/linux/virtio.h | 35 + + include/net/af_unix.h | 33 +- + include/net/cfg80211.h | 111 +- + include/net/devlink.h | 21 +- + include/net/dsa.h | 14 +- + include/net/dst_metadata.h | 10 +- + include/net/espintcp.h | 2 +- + include/net/flow_dissector.h | 2 +- + include/net/flow_offload.h | 57 +- + include/net/genetlink.h | 10 +- + include/net/gre.h | 66 +- + include/net/inet_connection_sock.h | 7 +- + include/net/inet_timewait_sock.h | 2 +- + include/net/ip6_fib.h | 8 +- + include/net/ip6_route.h | 11 +- + include/net/ip6_tunnel.h | 4 +- + include/net/ip_tunnels.h | 139 +- + include/net/libeth/rx.h | 242 +++ + include/net/mac80211.h | 76 +- + include/net/netlink.h | 41 +- + include/net/nexthop.h | 2 +- + include/net/page_pool/helpers.h | 34 +- + include/net/page_pool/types.h | 4 +- + include/net/pfcp.h | 90 + + include/net/pkt_cls.h | 9 + + include/net/red.h | 12 +- + include/net/request_sock.h | 4 +- + include/net/route.h | 11 +- + include/net/rps.h | 28 + + include/net/rstreason.h | 121 ++ + include/net/sch_generic.h | 5 + + include/net/scm.h | 9 + + include/net/smc.h | 3 - + include/net/sock.h | 10 +- + include/net/tcp.h | 51 +- + include/net/tls.h | 2 +- + include/net/udp_tunnel.h | 4 +- + include/trace/bpf_probe.h | 3 +- + include/trace/events/bpf_test_run.h | 17 + + include/trace/events/mdio.h | 2 +- + include/trace/events/net_probe_common.h | 71 + + include/trace/events/sock.h | 37 +- + include/trace/events/tcp.h | 134 +- + include/trace/events/udp.h | 29 +- + include/uapi/linux/bpf.h | 43 +- + include/uapi/linux/devlink.h | 1 + + include/uapi/linux/ethtool.h | 71 + + include/uapi/linux/ethtool_netlink.h | 33 +- + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/if_team.h | 158 +- + include/uapi/linux/if_tunnel.h | 36 + + include/uapi/linux/mptcp.h | 4 + + include/uapi/linux/nl80211.h | 236 +- + include/uapi/linux/pkt_cls.h | 14 + + io_uring/notif.c | 18 +- + ipc/ipc_sysctl.c | 2 +- + ipc/mq_sysctl.c | 2 +- + kernel/bpf/Makefile | 3 + + kernel/bpf/arena.c | 2 +- + kernel/bpf/arraymap.c | 51 +- + kernel/bpf/bpf_local_storage.c | 2 +- + kernel/bpf/bpf_struct_ops.c | 10 +- + kernel/bpf/btf.c | 24 +- + kernel/bpf/cgroup.c | 2 - + kernel/bpf/core.c | 50 +- + kernel/bpf/cpumask.c | 1 + + kernel/bpf/crypto.c | 385 ++++ + kernel/bpf/disasm.c | 14 + + kernel/bpf/hashtab.c | 79 +- + kernel/bpf/helpers.c | 366 +++- + kernel/bpf/log.c | 4 +- + kernel/bpf/lpm_trie.c | 31 +- + kernel/bpf/syscall.c | 41 +- + kernel/bpf/sysfs_btf.c | 6 +- + kernel/bpf/trampoline.c | 18 +- + kernel/bpf/verifier.c | 516 ++++- + kernel/trace/bpf_trace.c | 56 +- + kernel/trace/trace_probe.c | 2 - + kernel/ucount.c | 2 +- + lib/dynamic_queue_limits.c | 13 +- + lib/math/prime_numbers.c | 2 - + lib/test_bitmap.c | 203 +- + lib/test_bpf.c | 2 +- + net/8021q/vlan_netlink.c | 10 +- + net/Kconfig | 3 + + net/atm/clip.c | 2 +- + net/atm/common.c | 2 +- + net/ax25/Kconfig | 2 +- + net/ax25/sysctl_net_ax25.c | 2 +- + net/batman-adv/main.c | 2 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/netlink.c | 1 - + net/batman-adv/originator.c | 2 + + net/batman-adv/translation-table.c | 47 +- + net/bluetooth/6lowpan.c | 2 +- + net/bpf/bpf_dummy_struct_ops.c | 59 +- + net/bpf/test_run.c | 8 + + net/bridge/br_device.c | 2 +- + net/bridge/br_netfilter_hooks.c | 5 +- + net/bridge/br_vlan_tunnel.c | 9 +- + net/caif/cfctrl.c | 8 +- + net/core/Makefile | 2 +- + net/core/bpf_sk_storage.c | 23 +- + net/core/datagram.c | 19 - + net/core/dev.c | 398 ++-- + net/core/dev.h | 23 +- + net/core/dev_addr_lists_test.c | 14 +- + net/core/drop_monitor.c | 20 +- + net/core/dst_cache.c | 2 +- + net/core/fib_rules.c | 17 +- + net/core/filter.c | 45 +- + net/core/flow_dissector.c | 20 +- + net/core/gro.c | 1 + + net/core/neighbour.c | 74 +- + net/core/net-procfs.c | 3 +- + net/core/net-sysfs.c | 8 +- + net/core/net_namespace.c | 5 +- + net/core/{gso_test.c => net_test.c} | 129 +- + net/core/netdev-genl-gen.c | 1 + + net/core/netdev-genl.c | 52 +- + net/core/page_pool.c | 48 +- + net/core/rtnetlink.c | 15 +- + net/core/scm.c | 11 + + net/core/skbuff.c | 205 +- + net/core/sock.c | 13 +- + net/core/sock_map.c | 263 ++- + net/core/sysctl_net_core.c | 2 +- + net/dccp/ipv4.c | 12 +- + net/dccp/ipv6.c | 16 +- + net/dccp/minisocks.c | 3 +- + net/dccp/output.c | 2 +- + net/devlink/core.c | 6 +- + net/devlink/dev.c | 14 +- + net/devlink/param.c | 7 +- + net/devlink/port.c | 53 + + net/dsa/devlink.c | 3 +- + net/dsa/dsa.c | 11 + + net/dsa/port.c | 38 +- + net/dsa/user.c | 2 +- + net/ethtool/netlink.c | 48 +- + net/ethtool/netlink.h | 5 + + net/ethtool/pse-pd.c | 60 +- + net/ethtool/tsinfo.c | 52 +- + net/handshake/tlshd.c | 1 - + net/hsr/hsr_device.c | 36 +- + net/hsr/hsr_device.h | 4 +- + net/hsr/hsr_forward.c | 85 +- + net/hsr/hsr_framereg.c | 52 + + net/hsr/hsr_framereg.h | 4 + + net/hsr/hsr_main.h | 7 + + net/hsr/hsr_netlink.c | 30 +- + net/hsr/hsr_slave.c | 1 + + net/ieee802154/6lowpan/reassembly.c | 2 +- + net/ipv4/af_inet.c | 1 + + net/ipv4/arp.c | 9 +- + net/ipv4/devinet.c | 9 +- + net/ipv4/esp4.c | 3 +- + net/ipv4/fib_semantics.c | 2 +- + net/ipv4/fou_bpf.c | 2 +- + net/ipv4/gre_demux.c | 2 +- + net/ipv4/igmp.c | 3 +- + net/ipv4/inet_fragment.c | 4 +- + net/ipv4/inet_timewait_sock.c | 16 +- + net/ipv4/ip_fragment.c | 2 +- + net/ipv4/ip_gre.c | 144 +- + net/ipv4/ip_tunnel.c | 113 +- + net/ipv4/ip_tunnel_core.c | 82 +- + net/ipv4/ip_vti.c | 41 +- + net/ipv4/ipip.c | 33 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/route.c | 16 +- + net/ipv4/syncookies.c | 3 +- + net/ipv4/sysctl_net_ipv4.c | 2 +- + net/ipv4/tcp.c | 54 +- + net/ipv4/tcp_bbr.c | 4 - + net/ipv4/tcp_cubic.c | 4 - + net/ipv4/tcp_dctcp.c | 4 - + net/ipv4/tcp_input.c | 75 +- + net/ipv4/tcp_ipv4.c | 51 +- + net/ipv4/tcp_metrics.c | 7 +- + net/ipv4/tcp_minisocks.c | 14 +- + net/ipv4/tcp_offload.c | 4 +- + net/ipv4/tcp_output.c | 138 +- + net/ipv4/tcp_timer.c | 13 +- + net/ipv4/udp.c | 55 +- + net/ipv4/udp_tunnel_core.c | 5 +- + net/ipv4/xfrm4_policy.c | 2 +- + net/ipv6/addrconf.c | 5 +- + net/ipv6/addrlabel.c | 18 +- + net/ipv6/esp6.c | 3 +- + net/ipv6/icmp.c | 8 +- + net/ipv6/ila/ila_lwt.c | 4 +- + net/ipv6/ip6_fib.c | 51 +- + net/ipv6/ip6_gre.c | 110 +- + net/ipv6/ip6_output.c | 18 +- + net/ipv6/ip6_tunnel.c | 14 +- + net/ipv6/ip6_vti.c | 11 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/ndisc.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/ping.c | 2 +- + net/ipv6/raw.c | 4 +- + net/ipv6/reassembly.c | 2 +- + net/ipv6/route.c | 28 +- + net/ipv6/sit.c | 38 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/sysctl_net_ipv6.c | 6 +- + net/ipv6/tcp_ipv6.c | 48 +- + net/ipv6/udp.c | 34 +- + net/ipv6/xfrm6_policy.c | 4 +- + net/iucv/af_iucv.c | 2 +- + net/iucv/iucv.c | 26 +- + net/l2tp/l2tp_ip6.c | 2 +- + net/mac80211/cfg.c | 22 +- + net/mac80211/chan.c | 113 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/drop.h | 3 +- + net/mac80211/ht.c | 2 +- + net/mac80211/ieee80211_i.h | 25 +- + net/mac80211/iface.c | 9 +- + net/mac80211/link.c | 28 +- + net/mac80211/mlme.c | 135 +- + net/mac80211/offchannel.c | 12 +- + net/mac80211/rx.c | 4 +- + net/mac80211/scan.c | 16 +- + net/mac80211/spectmgmt.c | 18 +- + net/mac80211/sta_info.h | 4 +- + net/mac80211/status.c | 22 +- + net/mac80211/tx.c | 6 +- + net/mac80211/util.c | 21 +- + net/mac80211/wpa.c | 12 +- + net/mpls/af_mpls.c | 65 +- + net/mpls/mpls_iptunnel.c | 2 +- + net/mptcp/ctrl.c | 2 +- + net/mptcp/options.c | 1 + + net/mptcp/protocol.c | 11 +- + net/mptcp/protocol.h | 43 +- + net/mptcp/sockopt.c | 18 +- + net/mptcp/subflow.c | 57 +- + net/netfilter/ipvs/ip_vs_core.c | 6 +- + net/netfilter/ipvs/ip_vs_xmit.c | 34 +- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nf_flow_table_core.c | 8 +- + net/netfilter/nf_flow_table_ip.c | 4 +- + net/netfilter/nf_log.c | 2 +- + net/netfilter/nfnetlink.c | 5 + + net/netfilter/nft_rt.c | 2 +- + net/netfilter/nft_tunnel.c | 44 +- + net/netlink/af_netlink.c | 137 +- + net/netlink/genetlink.c | 2 + + net/netlink/genetlink.h | 11 + + net/nfc/netlink.c | 6 +- + net/openvswitch/datapath.c | 1 - + net/openvswitch/flow_netlink.c | 61 +- + net/openvswitch/meter.h | 1 - + net/openvswitch/vport-netdev.c | 7 + + net/packet/af_packet.c | 26 +- + net/psample/psample.c | 26 +- + net/rfkill/rfkill-gpio.c | 6 +- + net/rxrpc/af_rxrpc.c | 2 +- + net/sched/act_tunnel_key.c | 36 +- + net/sched/cls_api.c | 41 + + net/sched/cls_flower.c | 134 +- + net/sched/sch_cake.c | 112 +- + net/sched/sch_cbs.c | 20 +- + net/sched/sch_choke.c | 21 +- + net/sched/sch_codel.c | 29 +- + net/sched/sch_etf.c | 10 +- + net/sched/sch_ets.c | 25 +- + net/sched/sch_fifo.c | 13 +- + net/sched/sch_fq.c | 108 +- + net/sched/sch_fq_codel.c | 57 +- + net/sched/sch_fq_pie.c | 61 +- + net/sched/sch_generic.c | 3 + + net/sched/sch_hfsc.c | 9 +- + net/sched/sch_hhf.c | 35 +- + net/sched/sch_htb.c | 22 +- + net/sched/sch_mqprio.c | 6 +- + net/sched/sch_pie.c | 39 +- + net/sched/sch_skbprio.c | 8 +- + net/sched/sch_taprio.c | 5 +- + net/sctp/ipv6.c | 2 +- + net/sctp/socket.c | 2 +- + net/sctp/sysctl.c | 2 +- + net/smc/af_smc.c | 6 +- + net/smc/smc_clc.c | 6 +- + net/smc/smc_clc.h | 26 +- + net/smc/smc_rx.c | 4 +- + net/smc/smc_sysctl.c | 2 +- + net/tipc/socket.c | 5 +- + net/tls/Kconfig | 1 + + net/tls/tls_device.c | 1 + + net/tls/tls_device_fallback.c | 3 +- + net/tls/tls_strp.c | 1 + + net/tls/tls_sw.c | 1 - + net/unix/af_unix.c | 80 +- + net/unix/garbage.c | 712 +++--- + net/unix/sysctl_net_unix.c | 2 +- + net/wireless/nl80211.c | 3 +- + net/wireless/reg.c | 18 +- + net/wireless/reg.h | 13 +- + net/wireless/scan.c | 54 +- + net/xfrm/xfrm_policy.c | 3 +- + net/xfrm/xfrm_sysctl.c | 2 +- + scripts/kernel-doc | 1 + + tools/bpf/bpftool/Documentation/Makefile | 6 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 100 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 193 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 99 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 284 ++- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 52 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 73 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 232 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 98 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 34 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 374 ++-- + .../bpftool/Documentation/bpftool-struct_ops.rst | 71 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 60 +- + tools/bpf/bpftool/Documentation/common_options.rst | 26 +- + tools/bpf/bpftool/Makefile | 14 +- + tools/bpf/bpftool/bash-completion/bpftool | 61 +- + tools/bpf/bpftool/common.c | 96 +- + tools/bpf/bpftool/feature.c | 3 +- + tools/bpf/bpftool/gen.c | 5 +- + tools/bpf/bpftool/iter.c | 2 +- + tools/bpf/bpftool/link.c | 9 + + tools/bpf/bpftool/main.h | 3 +- + tools/bpf/bpftool/pids.c | 19 +- + tools/bpf/bpftool/prog.c | 7 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 +- + tools/bpf/bpftool/struct_ops.c | 2 +- + tools/include/linux/align.h | 12 + + tools/include/linux/bitmap.h | 9 +- + tools/include/linux/bitops.h | 2 + + tools/include/linux/compiler.h | 4 + + tools/include/linux/filter.h | 18 + + tools/include/linux/mm.h | 5 +- + tools/include/uapi/linux/bpf.h | 43 +- + tools/include/uapi/linux/ethtool.h | 2261 +++++++++++++++++++- + tools/lib/bpf/bpf.c | 16 +- + tools/lib/bpf/bpf.h | 9 + + tools/lib/bpf/bpf_core_read.h | 2 +- + tools/lib/bpf/bpf_helpers.h | 4 +- + tools/lib/bpf/btf_dump.c | 5 + + tools/lib/bpf/libbpf.c | 144 +- + tools/lib/bpf/libbpf.h | 25 + + tools/lib/bpf/libbpf.map | 9 + + tools/lib/bpf/libbpf_internal.h | 5 - + tools/lib/bpf/libbpf_probes.c | 6 +- + tools/lib/bpf/libbpf_version.h | 2 +- + tools/lib/bpf/ringbuf.c | 55 +- + tools/net/ynl/cli.py | 25 +- + tools/net/ynl/ethtool.py | 19 +- + tools/net/ynl/lib/ynl.h | 12 + + tools/net/ynl/lib/ynl.py | 162 +- + tools/net/ynl/samples/netdev.c | 2 + + tools/net/ynl/ynl-gen-c.py | 18 +- + tools/net/ynl/ynl-gen-rst.py | 62 +- + tools/perf/util/probe-finder.c | 4 +- + tools/testing/selftests/Makefile | 13 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 3 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/Makefile | 27 +- + tools/testing/selftests/bpf/bench.c | 39 +- + .../selftests/bpf/benchs/bench_bpf_crypto.c | 185 ++ + .../bpf/benchs/bench_local_storage_create.c | 2 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 431 ++-- + .../selftests/bpf/benchs/run_bench_trigger.sh | 22 +- + .../selftests/bpf/benchs/run_bench_uprobes.sh | 2 +- + tools/testing/selftests/bpf/bpf_experimental.h | 40 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 5 + + .../selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h | 1 + + tools/testing/selftests/bpf/cgroup_helpers.c | 2 +- + tools/testing/selftests/bpf/config | 7 + + tools/testing/selftests/bpf/network_helpers.c | 198 +- + tools/testing/selftests/bpf/network_helpers.h | 12 +- + .../selftests/bpf/prog_tests/arena_atomics.c | 186 ++ + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 114 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 109 +- + .../selftests/bpf/prog_tests/btf_map_in_map.c | 26 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 38 +- + .../selftests/bpf/prog_tests/crypto_sanity.c | 197 ++ + .../selftests/bpf/prog_tests/dummy_st_ops.c | 34 +- + tools/testing/selftests/bpf/prog_tests/empty_skb.c | 2 + + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 132 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 1 - + tools/testing/selftests/bpf/prog_tests/for_each.c | 62 + + .../selftests/bpf/prog_tests/ip_check_defrag.c | 2 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 260 ++- + tools/testing/selftests/bpf/prog_tests/ksyms.c | 30 +- + tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 + + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 216 +- + .../selftests/bpf/prog_tests/preempt_lock.c | 9 + + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 65 + + .../testing/selftests/bpf/prog_tests/send_signal.c | 2 +- + tools/testing/selftests/bpf/prog_tests/sk_assign.c | 55 +- + tools/testing/selftests/bpf/prog_tests/sock_addr.c | 6 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 171 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 38 + + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 2 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 14 + + .../bpf/prog_tests/test_struct_ops_module.c | 71 + + .../testing/selftests/bpf/prog_tests/test_tunnel.c | 4 + + .../selftests/bpf/prog_tests/trace_printk.c | 36 +- + .../selftests/bpf/prog_tests/trace_vprintk.c | 36 +- + .../bpf/prog_tests/verifier_kfunc_prog_types.c | 11 + + tools/testing/selftests/bpf/prog_tests/wq.c | 42 + + .../selftests/bpf/prog_tests/xdp_metadata.c | 16 + + tools/testing/selftests/bpf/progs/arena_atomics.c | 178 ++ + .../selftests/bpf/progs/cgrp_kfunc_common.h | 2 +- + tools/testing/selftests/bpf/progs/crypto_basic.c | 68 + + tools/testing/selftests/bpf/progs/crypto_bench.c | 109 + + tools/testing/selftests/bpf/progs/crypto_common.h | 66 + + tools/testing/selftests/bpf/progs/crypto_sanity.c | 169 ++ + .../selftests/bpf/progs/dummy_st_ops_success.c | 15 +- + .../selftests/bpf/progs/for_each_multi_maps.c | 49 + + tools/testing/selftests/bpf/progs/iters.c | 2 +- + tools/testing/selftests/bpf/progs/mptcpify.c | 4 + + tools/testing/selftests/bpf/progs/preempt_lock.c | 132 ++ + .../selftests/bpf/progs/struct_ops_module.c | 29 +- + .../selftests/bpf/progs/task_kfunc_common.h | 2 +- + tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c | 121 ++ + tools/testing/selftests/bpf/progs/tcp_rtt.c | 6 + + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 16 + + .../selftests/bpf/progs/test_ns_current_pid_tgid.c | 31 +- + tools/testing/selftests/bpf/progs/test_ringbuf_n.c | 47 + + .../selftests/bpf/progs/test_skmsg_load_helpers.c | 27 +- + .../selftests/bpf/progs/test_sockmap_pass_prog.c | 17 +- + .../bpf/progs/test_sockmap_skb_verdict_attach.c | 2 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 109 +- + .../bpf/progs/verifier_helper_restricted.c | 8 +- + .../bpf/progs/verifier_kfunc_prog_types.c | 122 ++ + .../bpf/progs/verifier_subprog_precision.c | 89 + + tools/testing/selftests/bpf/progs/wq.c | 180 ++ + tools/testing/selftests/bpf/progs/wq_failures.c | 144 ++ + tools/testing/selftests/bpf/test_cpp.cpp | 5 + + tools/testing/selftests/bpf/test_sock_addr.c | 138 +- + tools/testing/selftests/bpf/test_sockmap.c | 2 +- + tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 +- + tools/testing/selftests/bpf/testing_helpers.c | 16 +- + tools/testing/selftests/bpf/trace_helpers.c | 109 +- + tools/testing/selftests/bpf/trace_helpers.h | 9 + + tools/testing/selftests/bpf/uprobe_multi.c | 2 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 14 - + tools/testing/selftests/bpf/xskxceiver.c | 123 +- + tools/testing/selftests/bpf/xskxceiver.h | 12 +- + tools/testing/selftests/drivers/net/Makefile | 10 + + tools/testing/selftests/drivers/net/README.rst | 136 ++ + tools/testing/selftests/drivers/net/config | 2 + + tools/testing/selftests/drivers/net/hw/Makefile | 25 + + .../{net => drivers/net/hw}/devlink_port_split.py | 0 + .../{net/forwarding => drivers/net/hw}/ethtool.sh | 20 +- + .../net/hw}/ethtool_extended_state.sh | 5 +- + .../forwarding => drivers/net/hw}/ethtool_lib.sh | 0 + .../forwarding => drivers/net/hw}/ethtool_mm.sh | 3 +- + .../forwarding => drivers/net/hw}/ethtool_rmon.sh | 8 +- + .../forwarding => drivers/net/hw}/hw_stats_l3.sh | 20 +- + .../net/hw}/hw_stats_l3_gre.sh | 8 +- + .../{net/forwarding => drivers/net/hw}/loopback.sh | 5 +- + tools/testing/selftests/drivers/net/hw/settings | 1 + + .../selftests/drivers/net/lib/py/__init__.py | 18 + + tools/testing/selftests/drivers/net/lib/py/env.py | 216 ++ + .../testing/selftests/drivers/net/lib/py/remote.py | 15 + + .../selftests/drivers/net/lib/py/remote_netns.py | 21 + + .../selftests/drivers/net/lib/py/remote_ssh.py | 39 + + .../selftests/drivers/net/mlxsw/ethtool_lanes.sh | 14 +- + .../selftests/drivers/net/mlxsw/mlxsw_lib.sh | 2 +- + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 1 - + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 1 - + tools/testing/selftests/drivers/net/ping.py | 51 + + tools/testing/selftests/drivers/net/stats.py | 144 ++ + .../selftests/drivers/net/virtio_net/Makefile | 15 + + .../drivers/net/virtio_net/basic_features.sh | 131 ++ + .../selftests/drivers/net/virtio_net/config | 2 + + .../drivers/net/virtio_net/virtio_net_common.sh | 99 + + tools/testing/selftests/lib.mk | 17 +- + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 54 +- + tools/testing/selftests/net/af_unix/Makefile | 2 +- + tools/testing/selftests/net/af_unix/scm_rights.c | 286 +++ + tools/testing/selftests/net/bpf.mk | 53 + + .../{bpf/test_offload.py => net/bpf_offload.py} | 138 +- + tools/testing/selftests/net/fib_rule_tests.sh | 46 +- + tools/testing/selftests/net/forwarding/Makefile | 9 +- + tools/testing/selftests/net/forwarding/README | 33 + + .../net/forwarding/forwarding.config.sample | 53 +- + tools/testing/selftests/net/forwarding/ipip_lib.sh | 1 - + tools/testing/selftests/net/forwarding/lib.sh | 366 +++- + .../selftests/net/forwarding/lib_sh_test.sh | 208 ++ + .../selftests/net/forwarding/router_mpath_nh.sh | 35 + + .../net/forwarding/router_mpath_nh_lib.sh | 12 +- + .../net/forwarding/router_mpath_nh_res.sh | 35 + + .../testing/selftests/net/forwarding/router_nh.sh | 14 + + .../selftests/net/forwarding/sch_ets_tests.sh | 19 +- + tools/testing/selftests/net/forwarding/sch_red.sh | 10 +- + .../selftests/net/forwarding/sch_tbf_core.sh | 2 +- + .../testing/selftests/net/forwarding/tc_common.sh | 2 +- + .../selftests/net/forwarding/tc_tunnel_key.sh | 2 - + tools/testing/selftests/net/hsr/Makefile | 3 +- + tools/testing/selftests/net/hsr/hsr_common.sh | 84 + + tools/testing/selftests/net/hsr/hsr_ping.sh | 106 +- + tools/testing/selftests/net/hsr/hsr_redbox.sh | 92 + + tools/testing/selftests/net/lib.sh | 64 +- + tools/testing/selftests/net/lib/Makefile | 8 + + tools/testing/selftests/net/lib/py/__init__.py | 8 + + tools/testing/selftests/net/lib/py/consts.py | 9 + + tools/testing/selftests/net/lib/py/ksft.py | 155 ++ + tools/testing/selftests/net/lib/py/netns.py | 31 + + tools/testing/selftests/net/lib/py/nsim.py | 134 ++ + tools/testing/selftests/net/lib/py/utils.py | 92 + + tools/testing/selftests/net/lib/py/ynl.py | 49 + + tools/testing/selftests/net/mptcp/diag.sh | 53 + + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 155 +- + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 135 ++ + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 34 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 281 ++- + tools/testing/selftests/net/mptcp/simult_flows.sh | 20 +- + .../selftests/net/{nat6to4.c => nat6to4.bpf.c} | 0 + .../selftests/{ => net}/netfilter/.gitignore | 4 +- + tools/testing/selftests/net/netfilter/Makefile | 48 + + .../selftests/{ => net}/netfilter/audit_logread.c | 0 + .../selftests/net/netfilter/br_netfilter.sh | 167 ++ + .../selftests/net/netfilter/bridge_brouter.sh | 122 ++ + tools/testing/selftests/net/netfilter/config | 87 + + .../selftests/{ => net}/netfilter/connect_close.c | 0 + .../{ => net}/netfilter/conntrack_dump_flush.c | 10 +- + .../{ => net}/netfilter/conntrack_icmp_related.sh | 179 +- + .../netfilter/conntrack_ipip_mtu.sh} | 118 +- + .../net/netfilter/conntrack_sctp_collision.sh | 87 + + .../net/netfilter/conntrack_tcp_unreplied.sh | 153 ++ + .../selftests/{ => net}/netfilter/conntrack_vrf.sh | 121 +- + tools/testing/selftests/net/netfilter/ipvs.sh | 211 ++ + tools/testing/selftests/net/netfilter/lib.sh | 10 + + .../selftests/net/netfilter/nf_nat_edemux.sh | 97 + + .../nf-queue.c => net/netfilter/nf_queue.c} | 0 + .../selftests/{ => net}/netfilter/nft_audit.sh | 31 +- + .../{ => net}/netfilter/nft_concat_range.sh | 187 +- + .../net/netfilter/nft_conntrack_helper.sh | 171 ++ + tools/testing/selftests/net/netfilter/nft_fib.sh | 234 ++ + .../selftests/{ => net}/netfilter/nft_flowtable.sh | 364 ++-- + .../selftests/{ => net}/netfilter/nft_meta.sh | 4 +- + .../selftests/{ => net}/netfilter/nft_nat.sh | 476 ++--- + .../selftests/{ => net}/netfilter/nft_nat_zones.sh | 193 +- + tools/testing/selftests/net/netfilter/nft_queue.sh | 417 ++++ + .../selftests/net/netfilter/nft_synproxy.sh | 96 + + .../{ => net}/netfilter/nft_zones_many.sh | 93 +- + .../testing/selftests/{ => net}/netfilter/rpath.sh | 10 +- + .../selftests/{ => net}/netfilter/sctp_collision.c | 0 + tools/testing/selftests/net/netfilter/settings | 1 + + .../selftests/{ => net}/netfilter/xt_string.sh | 87 +- + tools/testing/selftests/net/nl_netdev.py | 98 + + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 16 +- + .../sample_map_ret0.bpf.c} | 2 +- + .../progs/sample_ret0.c => net/sample_ret0.bpf.c} | 3 + + tools/testing/selftests/net/udpgro.sh | 2 +- + tools/testing/selftests/net/udpgro_bench.sh | 2 +- + tools/testing/selftests/net/udpgro_frglist.sh | 8 +- + tools/testing/selftests/net/udpgro_fwd.sh | 2 +- + tools/testing/selftests/net/veth.sh | 2 +- + .../selftests/net/{xdp_dummy.c => xdp_dummy.bpf.c} | 0 + tools/testing/selftests/netfilter/Makefile | 21 - + .../testing/selftests/netfilter/bridge_brouter.sh | 146 -- + .../selftests/netfilter/bridge_netfilter.sh | 188 -- + tools/testing/selftests/netfilter/config | 9 - + .../netfilter/conntrack_sctp_collision.sh | 89 - + .../selftests/netfilter/conntrack_tcp_unreplied.sh | 167 -- + tools/testing/selftests/netfilter/ipvs.sh | 228 -- + tools/testing/selftests/netfilter/nf_nat_edemux.sh | 127 -- + .../selftests/netfilter/nft_conntrack_helper.sh | 197 -- + tools/testing/selftests/netfilter/nft_fib.sh | 273 --- + tools/testing/selftests/netfilter/nft_queue.sh | 449 ---- + tools/testing/selftests/netfilter/nft_synproxy.sh | 117 - + .../selftests/netfilter/nft_trans_stress.sh | 151 -- + tools/testing/selftests/netfilter/settings | 1 - + 1332 files changed, 55703 insertions(+), 21429 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/airoha,en8811h.yaml + create mode 100644 Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml + create mode 100644 Documentation/devicetree/bindings/net/pse-pd/ti,tps23881.yaml + create mode 100644 Documentation/netlink/specs/nftables.yaml + create mode 100644 Documentation/netlink/specs/team.yaml + create mode 100644 Documentation/networking/pse-pd/index.rst + create mode 100644 Documentation/networking/pse-pd/introduction.rst + create mode 100644 Documentation/networking/pse-pd/pse-pi.rst + create mode 100644 crypto/bpf_crypto_skcipher.c + rename drivers/net/ethernet/intel/ice/{ice_devlink.c => devlink/devlink.c} (77%) + rename drivers/net/ethernet/intel/ice/{ice_devlink.h => devlink/devlink.h} (100%) + create mode 100644 drivers/net/ethernet/intel/ice/devlink/devlink_port.c + create mode 100644 drivers/net/ethernet/intel/ice/devlink/devlink_port.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_adapter.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_adapter.h + create mode 100644 drivers/net/ethernet/intel/libeth/Kconfig + create mode 100644 drivers/net/ethernet/intel/libeth/Makefile + create mode 100644 drivers/net/ethernet/intel/libeth/rx.c + create mode 100644 drivers/net/ethernet/intel/libie/Kconfig + create mode 100644 drivers/net/ethernet/intel/libie/Makefile + create mode 100644 drivers/net/ethernet/intel/libie/rx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/dim.h + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_mirror.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_common.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c + create mode 100644 drivers/net/pfcp.c + create mode 100644 drivers/net/phy/air_en8811h.c + create mode 100644 drivers/net/phy/phy_link_topology.c + create mode 100644 drivers/net/pse-pd/pd692x0.c + create mode 100644 drivers/net/pse-pd/tps23881.c + rename drivers/net/team/{team.c => team_core.c} (97%) + create mode 100644 drivers/net/team/team_nl.c + create mode 100644 drivers/net/team/team_nl.h + create mode 100644 drivers/net/wireless/ath/ath11k/p2p.c + create mode 100644 drivers/net/wireless/ath/ath11k/p2p.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/tests/links.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b_tables.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b_tables.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723cs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723x.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723x.h + create mode 100644 drivers/virtio/virtio_debug.c + create mode 100644 include/linux/bpf_crypto.h + delete mode 100644 include/linux/genetlink.h + create mode 100644 include/linux/net/intel/libie/rx.h + create mode 100644 include/linux/phy_link_topology.h + create mode 100644 include/linux/phy_link_topology_core.h + create mode 100644 include/linux/skbuff_ref.h + create mode 100644 include/net/libeth/rx.h + create mode 100644 include/net/pfcp.h + create mode 100644 include/net/rstreason.h + create mode 100644 kernel/bpf/crypto.c + rename net/core/{gso_test.c => net_test.c} (67%) + create mode 100644 net/netlink/genetlink.h + create mode 100644 tools/include/linux/align.h + create mode 100644 tools/testing/selftests/bpf/benchs/bench_bpf_crypto.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/arena_atomics.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/crypto_sanity.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/preempt_lock.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/verifier_kfunc_prog_types.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/wq.c + create mode 100644 tools/testing/selftests/bpf/progs/arena_atomics.c + create mode 100644 tools/testing/selftests/bpf/progs/crypto_basic.c + create mode 100644 tools/testing/selftests/bpf/progs/crypto_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/crypto_common.h + create mode 100644 tools/testing/selftests/bpf/progs/crypto_sanity.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_multi_maps.c + create mode 100644 tools/testing/selftests/bpf/progs/preempt_lock.c + create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ringbuf_n.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_kfunc_prog_types.c + create mode 100644 tools/testing/selftests/bpf/progs/wq.c + create mode 100644 tools/testing/selftests/bpf/progs/wq_failures.c + create mode 100644 tools/testing/selftests/drivers/net/Makefile + create mode 100644 tools/testing/selftests/drivers/net/README.rst + create mode 100644 tools/testing/selftests/drivers/net/config + create mode 100644 tools/testing/selftests/drivers/net/hw/Makefile + rename tools/testing/selftests/{net => drivers/net/hw}/devlink_port_split.py (100%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool.sh (92%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_extended_state.sh (96%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_lib.sh (100%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_mm.sh (99%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_rmon.sh (91%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/hw_stats_l3.sh (96%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/hw_stats_l3_gre.sh (90%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/loopback.sh (92%) + create mode 100644 tools/testing/selftests/drivers/net/hw/settings + create mode 100644 tools/testing/selftests/drivers/net/lib/py/__init__.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/env.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/remote.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/remote_netns.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/remote_ssh.py + create mode 100755 tools/testing/selftests/drivers/net/ping.py + create mode 100755 tools/testing/selftests/drivers/net/stats.py + create mode 100644 tools/testing/selftests/drivers/net/virtio_net/Makefile + create mode 100755 tools/testing/selftests/drivers/net/virtio_net/basic_features.sh + create mode 100644 tools/testing/selftests/drivers/net/virtio_net/config + create mode 100644 tools/testing/selftests/drivers/net/virtio_net/virtio_net_common.sh + create mode 100644 tools/testing/selftests/net/af_unix/scm_rights.c + create mode 100644 tools/testing/selftests/net/bpf.mk + rename tools/testing/selftests/{bpf/test_offload.py => net/bpf_offload.py} (93%) + create mode 100755 tools/testing/selftests/net/forwarding/lib_sh_test.sh + create mode 100644 tools/testing/selftests/net/hsr/hsr_common.sh + create mode 100755 tools/testing/selftests/net/hsr/hsr_redbox.sh + create mode 100644 tools/testing/selftests/net/lib/Makefile + create mode 100644 tools/testing/selftests/net/lib/py/__init__.py + create mode 100644 tools/testing/selftests/net/lib/py/consts.py + create mode 100644 tools/testing/selftests/net/lib/py/ksft.py + create mode 100644 tools/testing/selftests/net/lib/py/netns.py + create mode 100644 tools/testing/selftests/net/lib/py/nsim.py + create mode 100644 tools/testing/selftests/net/lib/py/utils.py + create mode 100644 tools/testing/selftests/net/lib/py/ynl.py + rename tools/testing/selftests/net/{nat6to4.c => nat6to4.bpf.c} (100%) + rename tools/testing/selftests/{ => net}/netfilter/.gitignore (92%) + create mode 100644 tools/testing/selftests/net/netfilter/Makefile + rename tools/testing/selftests/{ => net}/netfilter/audit_logread.c (100%) + create mode 100755 tools/testing/selftests/net/netfilter/br_netfilter.sh + create mode 100755 tools/testing/selftests/net/netfilter/bridge_brouter.sh + create mode 100644 tools/testing/selftests/net/netfilter/config + rename tools/testing/selftests/{ => net}/netfilter/connect_close.c (100%) + rename tools/testing/selftests/{ => net}/netfilter/conntrack_dump_flush.c (98%) + rename tools/testing/selftests/{ => net}/netfilter/conntrack_icmp_related.sh (52%) + rename tools/testing/selftests/{netfilter/ipip-conntrack-mtu.sh => net/netfilter/conntrack_ipip_mtu.sh} (58%) + create mode 100755 tools/testing/selftests/net/netfilter/conntrack_sctp_collision.sh + create mode 100755 tools/testing/selftests/net/netfilter/conntrack_tcp_unreplied.sh + rename tools/testing/selftests/{ => net}/netfilter/conntrack_vrf.sh (60%) + create mode 100755 tools/testing/selftests/net/netfilter/ipvs.sh + create mode 100644 tools/testing/selftests/net/netfilter/lib.sh + create mode 100755 tools/testing/selftests/net/netfilter/nf_nat_edemux.sh + rename tools/testing/selftests/{netfilter/nf-queue.c => net/netfilter/nf_queue.c} (100%) + rename tools/testing/selftests/{ => net}/netfilter/nft_audit.sh (92%) + rename tools/testing/selftests/{ => net}/netfilter/nft_concat_range.sh (91%) + create mode 100755 tools/testing/selftests/net/netfilter/nft_conntrack_helper.sh + create mode 100755 tools/testing/selftests/net/netfilter/nft_fib.sh + rename tools/testing/selftests/{ => net}/netfilter/nft_flowtable.sh (54%) + rename tools/testing/selftests/{ => net}/netfilter/nft_meta.sh (95%) + rename tools/testing/selftests/{ => net}/netfilter/nft_nat.sh (62%) + rename tools/testing/selftests/{ => net}/netfilter/nft_nat_zones.sh (53%) + create mode 100755 tools/testing/selftests/net/netfilter/nft_queue.sh + create mode 100755 tools/testing/selftests/net/netfilter/nft_synproxy.sh + rename tools/testing/selftests/{ => net}/netfilter/nft_zones_many.sh (59%) + rename tools/testing/selftests/{ => net}/netfilter/rpath.sh (95%) + rename tools/testing/selftests/{ => net}/netfilter/sctp_collision.c (100%) + create mode 100644 tools/testing/selftests/net/netfilter/settings + rename tools/testing/selftests/{ => net}/netfilter/xt_string.sh (50%) + create mode 100755 tools/testing/selftests/net/nl_netdev.py + rename tools/testing/selftests/{bpf/progs/sample_map_ret0.c => net/sample_map_ret0.bpf.c} (96%) + rename tools/testing/selftests/{bpf/progs/sample_ret0.c => net/sample_ret0.bpf.c} (70%) + rename tools/testing/selftests/net/{xdp_dummy.c => xdp_dummy.bpf.c} (100%) + delete mode 100644 tools/testing/selftests/netfilter/Makefile + delete mode 100755 tools/testing/selftests/netfilter/bridge_brouter.sh + delete mode 100644 tools/testing/selftests/netfilter/bridge_netfilter.sh + delete mode 100644 tools/testing/selftests/netfilter/config + delete mode 100755 tools/testing/selftests/netfilter/conntrack_sctp_collision.sh + delete mode 100755 tools/testing/selftests/netfilter/conntrack_tcp_unreplied.sh + delete mode 100755 tools/testing/selftests/netfilter/ipvs.sh + delete mode 100755 tools/testing/selftests/netfilter/nf_nat_edemux.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_conntrack_helper.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_fib.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_queue.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_synproxy.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_trans_stress.sh + delete mode 100644 tools/testing/selftests/netfilter/settings +Merging bpf-next/for-next (1bba3b3d373d selftests/bpf: validate nulled-out struct_ops program is handled properly) +$ 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 +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/verifier.c +Merge made by the 'ort' strategy. + include/linux/btf_ids.h | 2 ++ + kernel/bpf/core.c | 16 ++++++++------- + kernel/bpf/verifier.c | 23 +++++++++++++++++----- + samples/bpf/Makefile | 2 +- + tools/lib/bpf/libbpf.c | 1 + + tools/testing/selftests/bpf/cgroup_helpers.c | 3 +++ + .../selftests/bpf/prog_tests/cgroup1_hierarchy.c | 7 ++++++- + .../bpf/prog_tests/test_struct_ops_module.c | 18 +++++++++++++++-- + .../bpf/progs/bench_local_storage_create.c | 5 +++-- + tools/testing/selftests/bpf/progs/local_storage.c | 20 ++++++++++--------- + tools/testing/selftests/bpf/progs/lsm_cgroup.c | 8 ++++++-- + .../selftests/bpf/progs/struct_ops_module.c | 7 +++++++ + tools/testing/selftests/bpf/test_sockmap.c | 10 ++++++++-- + tools/testing/selftests/bpf/veristat.c | 5 ++++- + 14 files changed, 95 insertions(+), 32 deletions(-) +Merging ipsec-next/master (aeb48a428d7d udpencap: Remove Obsolete UDP_ENCAP_ESPINUDP_NON_IKE Support) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging net/ipv4/esp4.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/xfrm4_input.c +Auto-merging net/ipv6/esp6.c +Auto-merging net/ipv6/xfrm6_input.c +Merge made by the 'ort' strategy. + include/uapi/linux/udp.h | 2 +- + net/ipv4/esp4.c | 12 ------------ + net/ipv4/udp.c | 2 -- + net/ipv4/xfrm4_input.c | 13 ------------- + net/ipv6/esp6.c | 12 ------------ + net/ipv6/xfrm6_input.c | 13 ------------- + 6 files changed, 1 insertion(+), 53 deletions(-) +Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device) +$ 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/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (ed1f164038b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (b4208ba1661e Bluetooth: hci_conn: Use __counted_by() to avoid -Wfamnae warning) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/btqca.c +CONFLICT (content): Merge conflict in drivers/bluetooth/btqca.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging net/bluetooth/6lowpan.c +Auto-merging net/bluetooth/hci_conn.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging net/bluetooth/mgmt.c +Auto-merging net/bluetooth/sco.c +Resolved 'drivers/bluetooth/btqca.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3df6c0d98449] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/ath3k.c | 25 +++--- + drivers/bluetooth/btintel.c | 59 +++++++++++-- + drivers/bluetooth/btintel.h | 6 ++ + drivers/bluetooth/btqca.c | 23 ++++- + drivers/bluetooth/btqcomsmd.c | 6 +- + drivers/bluetooth/btrtl.c | 7 ++ + drivers/bluetooth/btusb.c | 49 ++++++++--- + drivers/bluetooth/hci_bcm.c | 8 +- + drivers/bluetooth/hci_intel.c | 25 +++--- + include/net/bluetooth/bluetooth.h | 15 +++- + include/net/bluetooth/hci.h | 10 +-- + include/net/bluetooth/hci_core.h | 33 ++++++- + include/net/bluetooth/l2cap.h | 25 ++++-- + net/bluetooth/6lowpan.c | 2 +- + net/bluetooth/af_bluetooth.c | 119 ++++++++++++++++++++++++- + net/bluetooth/hci_conn.c | 145 ++++++++++++++++++++++++++---- + net/bluetooth/hci_core.c | 48 ++++++---- + net/bluetooth/hci_event.c | 77 +++++++++------- + net/bluetooth/hci_request.h | 4 - + net/bluetooth/hci_sync.c | 89 ++++++++----------- + net/bluetooth/iso.c | 181 ++++++++++++++++++++------------------ + net/bluetooth/l2cap_core.c | 57 ++++++------ + net/bluetooth/l2cap_sock.c | 23 +++-- + net/bluetooth/mgmt.c | 65 +++++++++++++- + net/bluetooth/sco.c | 31 +++++-- + net/bluetooth/smp.c | 2 +- + 26 files changed, 807 insertions(+), 327 deletions(-) +Merging wireless-next/for-next (cc1380dd1882 wifi: brcmfmac: remove unused brcmf_usb_image struct) +$ 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 'ort' strategy. + drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 7 ------- + drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 6 ------ + 2 files changed, 13 deletions(-) +Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS) +$ 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 MAINTAINERS +Auto-merging drivers/mtd/mtdcore.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/partitions/binman.yaml | 53 ++++++++++++++++ + .../bindings/mtd/partitions/partition.yaml | 72 ++++++++++++++++++++++ + .../bindings/mtd/samsung,s5pv210-onenand.yaml | 65 +++++++++++++++++++ + MAINTAINERS | 5 ++ + drivers/mtd/devices/mchp23k256.c | 1 - + drivers/mtd/maps/sa1100-flash.c | 6 +- + drivers/mtd/mtdcore.c | 9 ++- + drivers/mtd/parsers/redboot.c | 2 +- + 8 files changed, 205 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/samsung,s5pv210-onenand.yaml +Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/davinci_nand.c | 5 ++++- + drivers/mtd/nand/raw/nand_hynix.c | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1) +$ 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 +Already up to date. +Merging crypto/master (ed265f7fd9a6 crypto: x86/aes-gcm - simplify GCM hash subkey derivation) +$ 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 Documentation/driver-api/crypto/iaa/iaa-crypto.rst +Auto-merging MAINTAINERS +Auto-merging crypto/Makefile +Auto-merging drivers/crypto/Kconfig +Auto-merging include/crypto/hash.h +Auto-merging include/crypto/internal/acompress.h +Auto-merging include/crypto/skcipher.h +Auto-merging include/linux/compiler.h +Merge made by the 'ort' strategy. + .../bindings/crypto/nvidia,tegra234-se-aes.yaml | 52 + + .../bindings/crypto/nvidia,tegra234-se-hash.yaml | 52 + + .../devicetree/bindings/crypto/omap-sham.txt | 28 - + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + + .../bindings/crypto/starfive,jh7110-crypto.yaml | 30 +- + .../devicetree/bindings/crypto/ti,omap-sham.yaml | 56 + + Documentation/driver-api/crypto/iaa/iaa-crypto.rst | 96 +- + MAINTAINERS | 5 + + arch/arm64/crypto/aes-ce.S | 34 +- + arch/arm64/crypto/aes-neon.S | 20 +- + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/x86/Kconfig.assembler | 10 + + arch/x86/crypto/Makefile | 3 +- + arch/x86/crypto/aes-xts-avx-x86_64.S | 845 +++++++++ + arch/x86/crypto/aesni-intel_asm.S | 469 +---- + arch/x86/crypto/aesni-intel_glue.c | 420 +++-- + arch/x86/crypto/nh-avx2-x86_64.S | 1 + + arch/x86/crypto/sha256-avx2-asm.S | 1 + + arch/x86/crypto/sha256_ni_asm.S | 251 +-- + arch/x86/crypto/sha512-avx2-asm.S | 1 + + crypto/Kconfig | 20 - + crypto/Makefile | 2 - + crypto/acompress.c | 33 - + crypto/aead.c | 87 +- + crypto/ahash.c | 63 +- + crypto/akcipher.c | 31 - + crypto/algboss.c | 3 - + crypto/asymmetric_keys/public_key.c | 14 +- + crypto/asymmetric_keys/x509_cert_parser.c | 46 +- + crypto/asymmetric_keys/x509_parser.h | 3 + + crypto/asymmetric_keys/x509_public_key.c | 31 +- + crypto/cipher.c | 3 +- + crypto/compress.h | 3 - + crypto/{crypto_user_base.c => crypto_user.c} | 10 +- + crypto/crypto_user_stat.c | 176 -- + crypto/ecc.c | 100 +- + crypto/ecc_curve_defs.h | 49 + + crypto/ecdh.c | 11 +- + crypto/ecdsa.c | 66 +- + crypto/ecrdsa.c | 1 + + crypto/ecrdsa_defs.h | 5 + + crypto/fips.c | 1 - + crypto/hash.h | 30 - + crypto/jitterentropy-kcapi.c | 3 +- + crypto/jitterentropy.c | 4 +- + crypto/kpp.c | 30 - + crypto/lskcipher.c | 73 +- + crypto/rng.c | 44 +- + crypto/scompress.c | 3 - + crypto/shash.c | 75 +- + crypto/sig.c | 13 - + crypto/skcipher.c | 86 +- + crypto/skcipher.h | 10 - + crypto/testmgr.c | 7 + + crypto/testmgr.h | 146 ++ + drivers/char/hw_random/core.c | 2 +- + drivers/char/hw_random/mxc-rnga.c | 9 +- + drivers/char/hw_random/stm32-rng.c | 18 +- + drivers/crypto/Kconfig | 8 + + drivers/crypto/Makefile | 1 + + drivers/crypto/bcm/spu2.c | 2 +- + drivers/crypto/ccp/sp-platform.c | 14 +- + drivers/crypto/hisilicon/debugfs.c | 38 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 21 +- + drivers/crypto/hisilicon/qm.c | 8 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 4 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 26 +- + drivers/crypto/hisilicon/sgl.c | 5 +- + drivers/crypto/hisilicon/zip/zip_main.c | 24 +- + drivers/crypto/intel/iaa/iaa_crypto.h | 16 +- + drivers/crypto/intel/iaa/iaa_crypto_main.c | 17 +- + drivers/crypto/intel/iaa/iaa_crypto_stats.c | 183 +- + drivers/crypto/intel/iaa/iaa_crypto_stats.h | 8 - + .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 5 +- + .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 7 +- + .../crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 1 + + .../intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 1 + + .../crypto/intel/qat/qat_c62x/adf_c62x_hw_data.c | 1 + + .../intel/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 1 + + drivers/crypto/intel/qat/qat_common/Makefile | 6 +- + .../intel/qat/qat_common/adf_accel_devices.h | 88 + + .../crypto/intel/qat/qat_common/adf_common_drv.h | 10 + + .../intel/qat/qat_common/adf_gen2_hw_csr_data.c | 101 + + .../intel/qat/qat_common/adf_gen2_hw_csr_data.h | 86 + + .../crypto/intel/qat/qat_common/adf_gen2_hw_data.c | 97 - + .../crypto/intel/qat/qat_common/adf_gen2_hw_data.h | 76 - + .../intel/qat/qat_common/adf_gen4_hw_csr_data.c | 231 +++ + .../intel/qat/qat_common/adf_gen4_hw_csr_data.h | 188 ++ + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.c | 380 +++- + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.h | 127 +- + .../crypto/intel/qat/qat_common/adf_gen4_pfvf.c | 8 +- + drivers/crypto/intel/qat/qat_common/adf_gen4_tl.c | 1 + + .../crypto/intel/qat/qat_common/adf_gen4_vf_mig.c | 1010 ++++++++++ + .../crypto/intel/qat/qat_common/adf_gen4_vf_mig.h | 10 + + .../crypto/intel/qat/qat_common/adf_mstate_mgr.c | 318 ++++ + .../crypto/intel/qat/qat_common/adf_mstate_mgr.h | 89 + + .../intel/qat/qat_common/adf_pfvf_pf_proto.c | 8 +- + .../crypto/intel/qat/qat_common/adf_pfvf_utils.h | 11 + + drivers/crypto/intel/qat/qat_common/adf_rl.c | 12 +- + drivers/crypto/intel/qat/qat_common/adf_rl.h | 2 + + drivers/crypto/intel/qat/qat_common/adf_sriov.c | 7 +- + .../crypto/intel/qat/qat_common/adf_telemetry.c | 21 + + .../crypto/intel/qat/qat_common/adf_telemetry.h | 1 + + .../crypto/intel/qat/qat_common/adf_transport.c | 4 +- + .../crypto/intel/qat/qat_common/qat_asym_algs.c | 66 +- + drivers/crypto/intel/qat/qat_common/qat_bl.c | 6 +- + drivers/crypto/intel/qat/qat_common/qat_bl.h | 11 +- + drivers/crypto/intel/qat/qat_common/qat_mig_dev.c | 130 ++ + .../intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 1 + + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 1 + + drivers/crypto/marvell/octeontx2/cn10k_cpt.c | 4 + + drivers/crypto/nx/nx-842.c | 6 +- + drivers/crypto/nx/nx-842.h | 10 +- + drivers/crypto/starfive/Kconfig | 4 + + drivers/crypto/starfive/jh7110-aes.c | 595 ++++-- + drivers/crypto/starfive/jh7110-cryp.c | 43 - + drivers/crypto/starfive/jh7110-cryp.h | 10 +- + drivers/crypto/starfive/jh7110-hash.c | 285 ++- + drivers/crypto/starfive/jh7110-rsa.c | 3 + + drivers/crypto/stm32/stm32-hash.c | 570 ++++-- + drivers/crypto/tegra/Makefile | 9 + + drivers/crypto/tegra/tegra-se-aes.c | 1933 ++++++++++++++++++++ + drivers/crypto/tegra/tegra-se-hash.c | 1060 +++++++++++ + drivers/crypto/tegra/tegra-se-key.c | 156 ++ + drivers/crypto/tegra/tegra-se-main.c | 437 +++++ + drivers/crypto/tegra/tegra-se.h | 560 ++++++ + drivers/gpu/host1x/dev.c | 24 + + include/crypto/acompress.h | 73 +- + include/crypto/aead.h | 21 - + include/crypto/akcipher.h | 78 +- + include/crypto/algapi.h | 3 - + include/crypto/ecc_curve.h | 2 + + include/crypto/ecdh.h | 1 + + include/crypto/hash.h | 22 - + include/crypto/internal/acompress.h | 1 - + include/crypto/internal/cryptouser.h | 16 - + include/crypto/internal/ecc.h | 27 +- + include/crypto/internal/scompress.h | 1 - + include/crypto/kpp.h | 58 +- + include/crypto/rng.h | 51 +- + include/crypto/skcipher.h | 25 - + include/linux/compiler.h | 2 + + include/linux/oid_registry.h | 1 + + include/linux/qat/qat_mig_dev.h | 31 + + include/uapi/linux/cryptouser.h | 30 +- + kernel/padata.c | 8 +- + 147 files changed, 10166 insertions(+), 3180 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/nvidia,tegra234-se-aes.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/nvidia,tegra234-se-hash.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txt + create mode 100644 Documentation/devicetree/bindings/crypto/ti,omap-sham.yaml + create mode 100644 arch/x86/crypto/aes-xts-avx-x86_64.S + rename crypto/{crypto_user_base.c => crypto_user.c} (98%) + delete mode 100644 crypto/crypto_user_stat.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen2_hw_csr_data.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen2_hw_csr_data.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_hw_csr_data.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_hw_csr_data.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.h + create mode 100644 drivers/crypto/intel/qat/qat_common/qat_mig_dev.c + create mode 100644 drivers/crypto/tegra/Makefile + create mode 100644 drivers/crypto/tegra/tegra-se-aes.c + create mode 100644 drivers/crypto/tegra/tegra-se-hash.c + create mode 100644 drivers/crypto/tegra/tegra-se-key.c + create mode 100644 drivers/crypto/tegra/tegra-se-main.c + create mode 100644 drivers/crypto/tegra/tegra-se.h + delete mode 100644 include/crypto/internal/cryptouser.h + create mode 100644 include/linux/qat/qat_mig_dev.h +Merging drm/drm-next (b84bc948528e Merge v6.9-rc6 into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/display/panel/panel-simple.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/amd/display/dc/dml2/Makefile +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gvt/mmio.c +Auto-merging drivers/gpu/drm/imagination/pvr_vm_mips.c +Auto-merging drivers/gpu/drm/mediatek/mtk_gem.c +Auto-merging drivers/gpu/drm/ttm/ttm_tt.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-intel-xe-hwmon | 114 +- + .../ABI/testing/sysfs-driver-panfrost-profiling | 10 + + .../bindings/display/bridge/ite,it6505.yaml | 8 +- + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../display/bridge/microchip,sam9x75-lvds.yaml | 55 + + .../bindings/display/bridge/toshiba,tc358775.yaml | 39 +- + .../bindings/display/mediatek/mediatek,gamma.yaml | 5 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 1 + + .../bindings/display/panel/lg,sw43408.yaml | 62 + + .../bindings/display/panel/novatek,nt35950.yaml | 3 +- + .../bindings/display/panel/novatek,nt36523.yaml | 25 +- + .../bindings/display/panel/panel-common-dual.yaml | 47 + + .../bindings/display/panel/panel-simple-dsi.yaml | 4 + + .../bindings/display/panel/panel-simple.yaml | 6 + + .../bindings/display/panel/raydium,rm69380.yaml | 89 + + .../display/panel/rocktech,jh057n00900.yaml | 2 + + .../bindings/display/panel/sony,td4353-jdi.yaml | 2 + + .../display/rockchip/rockchip,dw-hdmi.yaml | 5 + + .../display/rockchip/rockchip,inno-hdmi.yaml | 5 + + .../display/rockchip/rockchip,rk3066-hdmi.yaml | 7 + + .../bindings/gpu/arm,mali-valhall-csf.yaml | 147 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/driver-api/dma-buf.rst | 2 +- + Documentation/gpu/amdgpu/debugging.rst | 80 + + .../gpu/amdgpu/display/display-contributing.rst | 2 +- + Documentation/gpu/amdgpu/index.rst | 1 + + Documentation/gpu/driver-uapi.rst | 5 + + Documentation/gpu/drm-kms.rst | 22 + + Documentation/gpu/i915.rst | 9 + + Documentation/gpu/panfrost.rst | 9 + + Documentation/gpu/rfc/i915_vm_bind.h | 11 +- + MAINTAINERS | 200 +- + arch/m68k/include/asm/pgtable.h | 2 + + arch/parisc/configs/generic-32bit_defconfig | 2 +- + drivers/accel/ivpu/ivpu_debugfs.c | 2 + + drivers/accel/qaic/Makefile | 5 +- + drivers/accel/qaic/qaic.h | 9 + + drivers/accel/qaic/qaic_data.c | 9 + + drivers/accel/qaic/qaic_debugfs.c | 338 ++ + drivers/accel/qaic/qaic_debugfs.h | 20 + + drivers/accel/qaic/qaic_drv.c | 26 +- + drivers/accel/qaic/sahara.c | 449 +++ + drivers/accel/qaic/sahara.h | 10 + + drivers/base/devcoredump.c | 23 + + drivers/dma-buf/dma-buf.c | 56 +- + drivers/gpu/drm/Kconfig | 55 +- + drivers/gpu/drm/Makefile | 30 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 12 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 346 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h | 47 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 140 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 269 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 25 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 105 - + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c | 112 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 13 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 12 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 48 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 17 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 15 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 26 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 55 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 40 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 7 + + drivers/gpu/drm/amd/amdgpu/si.c | 4 +- + drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.c | 62 + + drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 209 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 62 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 6 - + drivers/gpu/drm/amd/amdgpu/vi.c | 8 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 52 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 18 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 25 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 6 +- + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 48 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 42 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 66 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 8 + + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 - + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +- + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 1 - + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 1 - + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 11 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 5 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 2 +- + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 1 - + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.h | 42 +- + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 2 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 3 +- + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 9 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h | 3 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 41 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 21 - + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 2 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 1012 ++++-- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 202 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 62 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 65 +- + drivers/gpu/drm/amd/display/dc/dc.h | 225 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 179 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 8 + + drivers/gpu/drm/amd/display/dc/dc_plane.h | 2 +- + drivers/gpu/drm/amd/display/dc/dc_plane_priv.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_state.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_state_priv.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 10 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 20 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 4 - + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 7 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 1 + + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 6 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 2 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 10 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.c | 11 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c | 4 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubp.c | 5 + + .../amd/display/dc/dcn201/dcn201_link_encoder.h | 14 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h | 18 - + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 2 - + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 3 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c | 2 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h | 23 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 1 + + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 2 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.h | 2 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 4 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 8 +- + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 10 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 8 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c | 207 +- + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.c | 3 +- + .../display/dc/dcn35/dcn35_dio_stream_encoder.h | 1 - + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c | 4 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 10 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 7 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 10 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 1 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 2 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 267 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 14 +- + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 8 +- + .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 3 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 1 + + .../drm/amd/display/dc/dml2/display_mode_core.c | 15 +- + .../drm/amd/display/dc/dml2/display_mode_core.h | 1 + + .../amd/display/dc/dml2/display_mode_lib_defines.h | 2 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 163 +- + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.h | 2 + + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 11 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 60 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 78 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h | 5 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 16 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 34 +- + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 77 + + .../drm/amd/display/dc/dpp/dcn10/CMakeLists.txt | 6 + + .../drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.h | 3 +- + .../amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_cm.c | 4 +- + .../display/dc/{ => dpp}/dcn10/dcn10_dpp_dscl.c | 2 +- + .../drm/amd/display/dc/dpp/dcn20/CMakeLists.txt | 5 + + .../drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.h | 2 +- + .../amd/display/dc/{ => dpp}/dcn20/dcn20_dpp_cm.c | 12 +- + .../drm/amd/display/dc/dpp/dcn201/CMakeLists.txt | 4 + + .../amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.c | 2 +- + .../amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.h | 0 + .../drm/amd/display/dc/dpp/dcn30/CMakeLists.txt | 5 + + .../drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.c | 18 +- + .../drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.h | 4 + + .../amd/display/dc/{ => dpp}/dcn30/dcn30_dpp_cm.c | 4 +- + .../drm/amd/display/dc/dpp/dcn32/CMakeLists.txt | 4 + + .../drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.h | 0 + .../drm/amd/display/dc/dpp/dcn35/CMakeLists.txt | 4 + + .../gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c | 112 + + .../drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.h | 9 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 8 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 7 +- + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 13 - + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 2 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 50 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 40 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 112 +- + .../gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 70 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 5 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 85 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 107 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 8 +- + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 4 +- + .../gpu/drm/amd/display/dc/hwss/dcn351/Makefile | 25 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_hwseq.c | 182 + + .../dcn35_dpp.c => hwss/dcn351/dcn351_hwseq.h} | 38 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 4 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 13 +- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 30 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 2 - + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 30 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 2 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 - + .../drm/amd/display/dc/inc/hw/timing_generator.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/hw/vpg.h | 53 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 24 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 2 +- + .../display/dc/link/accessories/link_dp_trace.c | 1 - + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 8 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 4 +- + .../display/dc/link/protocols/link_dp_training.c | 16 +- + .../dc/link/protocols/link_dp_training_dpia.c | 4 +- + .../drm/amd/display/dc/link/protocols/link_dpcd.c | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 71 +- + .../dc/link/protocols/link_edp_panel_control.h | 4 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 18 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 9 +- + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 10 - + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 11 +- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 165 +- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.h | 6 +- + drivers/gpu/drm/amd/display/dc/resource/Makefile | 6 - + .../display/dc/resource/dce112/dce112_resource.c | 2 - + .../display/dc/resource/dce120/dce120_resource.c | 2 +- + .../amd/display/dc/resource/dce80/dce80_resource.c | 1 - + .../amd/display/dc/resource/dcn10/dcn10_resource.c | 4 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 7 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 6 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 33 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 2 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 7 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 21 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 3 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 120 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 12 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 41 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 22 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.h | 2 + + .../display/dc/resource/dcn351/dcn351_resource.c | 24 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 18 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 221 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 2 + + .../gpu/drm/amd/display/include/grph_object_id.h | 4 +- + .../drm/amd/display/include/link_service_types.h | 1 - + drivers/gpu/drm/amd/display/include/logger_types.h | 1 + + drivers/gpu/drm/amd/display/include/signal_types.h | 13 + + .../drm/amd/display/modules/color/color_gamma.c | 2 +- + .../drm/amd/display/modules/freesync/freesync.c | 8 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 2 +- + .../amd/display/modules/info_packet/info_packet.c | 2 - + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 24 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 9 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 20 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 8 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 28 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 18 + + .../amd/include/asic_reg/dcn/dcn_3_1_2_offset.h | 4 + + .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 19 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_offset.h | 60 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 27 + + .../amd/include/asic_reg/dcn/dcn_3_2_1_offset.h | 37 +- + .../amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h | 16 + + .../amd/include/asic_reg/dpcs/dpcs_3_0_3_sh_mask.h | 4 +- + .../amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h | 10 + + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 4 + + .../amd/include/asic_reg/oss/osssys_6_0_0_offset.h | 4 + + .../include/asic_reg/oss/osssys_6_0_0_sh_mask.h | 10 + + .../include/asic_reg/smuio/smuio_14_0_2_offset.h | 511 +++ + .../include/asic_reg/smuio/smuio_14_0_2_sh_mask.h | 1106 +++++++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 3 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 21 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 8 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 224 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 6 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 41 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 6 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.c | 6 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.c | 8 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.c | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 12 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 13 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0.h | 1836 ++++++++++ + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 6 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v14_0_2_ppsmc.h | 140 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 7 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 7 +- + .../gpu/drm/amd/pm/swsmu/inc/smu_v14_0_2_pptable.h | 164 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 18 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 21 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 91 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 131 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 6 + + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 1796 ++++++++++ + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.h | 28 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 67 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 2 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 1 + + drivers/gpu/drm/arm/malidp_mw.c | 5 +- + drivers/gpu/drm/armada/armada_debugfs.c | 1 + + drivers/gpu/drm/ast/Makefile | 10 +- + drivers/gpu/drm/ast/{ast_i2c.c => ast_ddc.c} | 126 +- + drivers/gpu/drm/ast/ast_ddc.h | 11 + + drivers/gpu/drm/ast/ast_drv.c | 1 + + drivers/gpu/drm/ast/ast_drv.h | 39 +- + drivers/gpu/drm/ast/ast_main.c | 1 + + drivers/gpu/drm/ast/ast_mode.c | 165 +- + drivers/gpu/drm/bridge/Kconfig | 36 +- + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 20 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 18 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 15 +- + drivers/gpu/drm/bridge/cadence/Kconfig | 8 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 3 + + drivers/gpu/drm/bridge/chipone-icn6211.c | 7 +- + drivers/gpu/drm/bridge/imx/Kconfig | 8 +- + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 6 +- + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 6 +- + drivers/gpu/drm/bridge/ite-it6505.c | 1 + + drivers/gpu/drm/bridge/ite-it66121.c | 23 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 6 +- + drivers/gpu/drm/bridge/microchip-lvds.c | 229 ++ + drivers/gpu/drm/bridge/panel.c | 2 + + drivers/gpu/drm/bridge/synopsys/Kconfig | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 31 +- + drivers/gpu/drm/bridge/tc358764.c | 1 - + drivers/gpu/drm/bridge/tc358775.c | 104 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 21 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 17 +- + drivers/gpu/drm/ci/test.yml | 6 +- + drivers/gpu/drm/display/Kconfig | 76 +- + drivers/gpu/drm/display/Makefile | 6 +- + drivers/gpu/drm/display/drm_dp_helper.c | 41 +- + drivers/gpu/drm/display/drm_dp_helper_internal.h | 2 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 42 +- + .../gpu/drm/display/drm_dp_mst_topology_internal.h | 4 +- + drivers/gpu/drm/display/drm_dp_tunnel.c | 17 +- + drivers/gpu/drm/drm_atomic_helper.c | 4 + + drivers/gpu/drm/drm_atomic_uapi.c | 6 +- + drivers/gpu/drm/drm_bridge.c | 24 +- + drivers/gpu/drm/drm_buddy.c | 431 ++- + drivers/gpu/drm/drm_client.c | 92 +- + drivers/gpu/drm/drm_client_modeset.c | 129 +- + drivers/gpu/drm/drm_crtc.c | 38 +- + drivers/gpu/drm/drm_crtc_helper.c | 100 +- + drivers/gpu/drm/drm_crtc_helper_internal.h | 15 +- + drivers/gpu/drm/drm_crtc_internal.h | 13 + + drivers/gpu/drm/drm_displayid.c | 7 +- + .../gpu/drm/drm_displayid_internal.h | 6 +- + drivers/gpu/drm/drm_drv.c | 5 + + drivers/gpu/drm/drm_edid.c | 266 +- + drivers/gpu/drm/drm_eld.c | 4 +- + drivers/gpu/drm/drm_fb_dma_helper.c | 42 + + drivers/gpu/drm/drm_fbdev_generic.c | 4 +- + drivers/gpu/drm/drm_gem.c | 34 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 7 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 105 +- + drivers/gpu/drm/drm_internal.h | 10 +- + drivers/gpu/drm/drm_mipi_dsi.c | 55 +- + drivers/gpu/drm/drm_mode_config.c | 7 + + drivers/gpu/drm/drm_modes.c | 40 +- + drivers/gpu/drm/drm_panic.c | 585 ++++ + drivers/gpu/drm/drm_plane.c | 56 + + drivers/gpu/drm/drm_print.c | 6 +- + drivers/gpu/drm/drm_probe_helper.c | 95 +- + drivers/gpu/drm/drm_sysfs.c | 20 +- + drivers/gpu/drm/drm_vblank.c | 58 +- + drivers/gpu/drm/drm_vblank_work.c | 2 +- + drivers/gpu/drm/exynos/Kconfig | 4 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_mic.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 16 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 1 - + drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 - + drivers/gpu/drm/gud/gud_connector.c | 12 +- + drivers/gpu/drm/i915/Kconfig | 8 +- + drivers/gpu/drm/i915/Kconfig.debug | 4 +- + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/display/bxt_dpio_phy_regs.h | 273 ++ + drivers/gpu/drm/i915/display/icl_dsi.c | 3 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 50 +- + drivers/gpu/drm/i915/display/intel_bios.c | 247 +- + drivers/gpu/drm/i915/display/intel_bw.c | 160 +- + drivers/gpu/drm/i915/display/intel_bw.h | 9 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 204 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 12 +- + .../gpu/drm/i915/display/intel_combo_phy_regs.h | 117 +- + drivers/gpu/drm/i915/display/intel_crt.c | 5 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 333 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 48 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 387 +-- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 3 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 264 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 18 +- + drivers/gpu/drm/i915/display/intel_de.h | 188 +- + drivers/gpu/drm/i915/display/intel_display.c | 710 ++-- + drivers/gpu/drm/i915/display/intel_display.h | 22 + + .../drm/i915/display/intel_display_conversion.h | 22 + + drivers/gpu/drm/i915/display/intel_display_core.h | 17 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 126 +- + .../gpu/drm/i915/display/intel_display_device.c | 8 + + .../gpu/drm/i915/display/intel_display_device.h | 6 +- + .../gpu/drm/i915/display/intel_display_driver.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 57 +- + .../gpu/drm/i915/display/intel_display_params.c | 9 + + .../gpu/drm/i915/display/intel_display_params.h | 2 + + drivers/gpu/drm/i915/display/intel_display_power.c | 8 +- + .../drm/i915/display/intel_display_power_well.c | 91 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 99 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 8 - + drivers/gpu/drm/i915/display/intel_dmc.c | 185 +- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 6 + + drivers/gpu/drm/i915/display/intel_dmc_wl.c | 264 ++ + drivers/gpu/drm/i915/display/intel_dmc_wl.h | 31 + + drivers/gpu/drm/i915/display/intel_dp.c | 321 +- + drivers/gpu/drm/i915/display/intel_dp.h | 5 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 15 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 17 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 244 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 208 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 48 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 342 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 12 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 607 ++-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 82 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 5 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 5 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_fb.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 32 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 5 + + .../i915/{i915_fixed.h => display/intel_fixed.h} | 0 + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 6 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 6 + + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 7 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 96 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 5 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 58 +- + drivers/gpu/drm/i915/display/intel_opregion.h | 6 + + drivers/gpu/drm/i915/display/intel_overlay.c | 7 +- + drivers/gpu/drm/i915/display/intel_panel.c | 10 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 4 +- + drivers/gpu/drm/i915/display/intel_pmdemand.c | 14 +- + drivers/gpu/drm/i915/display/intel_pmdemand.h | 5 +- + drivers/gpu/drm/i915/display/intel_pps.c | 40 +- + drivers/gpu/drm/i915/display/intel_pps.h | 2 + + drivers/gpu/drm/i915/display/intel_psr.c | 454 ++- + drivers/gpu/drm/i915/display/intel_psr.h | 5 + + drivers/gpu/drm/i915/display/intel_psr_regs.h | 12 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 56 +- + drivers/gpu/drm/i915/display/intel_quirks.h | 6 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 9 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 22 +- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 4 +- + drivers/gpu/drm/i915/display/intel_tc.c | 33 +- + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 36 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 33 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 7 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 322 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 14 +- + drivers/gpu/drm/i915/display/skl_watermark_regs.h | 18 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 470 ++- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 22 +- + drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 325 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 4 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 8 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 5 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 40 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 43 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gsc.c | 15 - + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 52 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 - + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 59 - + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 21 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 51 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 22 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 52 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 6 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 13 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 183 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 - + drivers/gpu/drm/i915/gvt/display.c | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 7 +- + drivers/gpu/drm/i915/gvt/mmio.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 13 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 1 + + drivers/gpu/drm/i915/i915_drv.h | 26 +- + drivers/gpu/drm/i915/i915_getparam.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- + drivers/gpu/drm/i915/i915_hwmon.c | 52 +- + drivers/gpu/drm/i915/i915_irq.c | 8 +- + drivers/gpu/drm/i915/i915_params.c | 3 - + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 66 +- + drivers/gpu/drm/i915/i915_perf.c | 19 +- + drivers/gpu/drm/i915/i915_query.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 305 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 6 +- + drivers/gpu/drm/i915/i915_utils.h | 14 - + drivers/gpu/drm/i915/intel_clock_gating.c | 59 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 - + drivers/gpu/drm/i915/intel_device_info.h | 2 - + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 19 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 14 +- + drivers/gpu/drm/i915/intel_step.c | 80 +- + drivers/gpu/drm/i915/intel_uncore.c | 380 +-- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 3 - + drivers/gpu/drm/i915/soc/intel_dram.c | 2 + + drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 + + drivers/gpu/drm/imagination/pvr_vm_mips.c | 4 +- + drivers/gpu/drm/imx/ipuv3/Kconfig | 5 +- + drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 12 +- + drivers/gpu/drm/ingenic/Kconfig | 2 +- + drivers/gpu/drm/lima/lima_bcast.c | 12 + + drivers/gpu/drm/lima/lima_bcast.h | 3 + + drivers/gpu/drm/lima/lima_drv.c | 21 +- + drivers/gpu/drm/lima/lima_drv.h | 5 + + drivers/gpu/drm/lima/lima_gp.c | 10 + + drivers/gpu/drm/lima/lima_mmu.c | 5 + + drivers/gpu/drm/lima/lima_pp.c | 22 + + drivers/gpu/drm/lima/lima_sched.c | 9 + + drivers/gpu/drm/lima/lima_sched.h | 1 + + drivers/gpu/drm/loongson/lsdc_crtc.c | 1 + + drivers/gpu/drm/loongson/lsdc_gem.c | 13 +- + drivers/gpu/drm/mediatek/Kconfig | 6 +- + drivers/gpu/drm/mediatek/Makefile | 12 +- + .../drm/mediatek/{mtk_drm_crtc.c => mtk_crtc.c} | 218 +- + drivers/gpu/drm/mediatek/mtk_crtc.h | 28 + + .../{mtk_drm_ddp_comp.c => mtk_ddp_comp.c} | 51 +- + .../{mtk_drm_ddp_comp.h => mtk_ddp_comp.h} | 9 +- + drivers/gpu/drm/mediatek/mtk_disp_aal.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_color.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +- + drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_merge.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +- + drivers/gpu/drm/mediatek/mtk_dp.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 30 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 34 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 33 +- + drivers/gpu/drm/mediatek/mtk_ethdr.c | 5 +- + .../gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} | 68 +- + .../gpu/drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} | 23 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +- + drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 3 +- + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 1 - + drivers/gpu/drm/mediatek/mtk_padding.c | 5 +- + .../drm/mediatek/{mtk_drm_plane.c => mtk_plane.c} | 26 +- + .../drm/mediatek/{mtk_drm_plane.h => mtk_plane.h} | 4 +- + drivers/gpu/drm/meson/Kconfig | 2 +- + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 7 + + drivers/gpu/drm/meson/meson_vclk.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 7 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 18 + + drivers/gpu/drm/msm/Kconfig | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 + + drivers/gpu/drm/msm/msm_gem.c | 20 +- + drivers/gpu/drm/msm/msm_gem.h | 4 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 20 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 6 +- + drivers/gpu/drm/nouveau/Kconfig | 10 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 12 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 43 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 + + drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 - + drivers/gpu/drm/omapdrm/omap_fb.c | 1 + + drivers/gpu/drm/omapdrm/omap_fbdev.c | 40 +- + drivers/gpu/drm/panel/Kconfig | 64 +- + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-edp.c | 164 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 228 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 1 + + drivers/gpu/drm/panel/panel-khadas-ts050.c | 1112 ++++--- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 5 +- + drivers/gpu/drm/panel/panel-lg-sw43408.c | 320 ++ + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 6 +- + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 11 +- + drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 33 +- + drivers/gpu/drm/panel/panel-raydium-rm69380.c | 344 ++ + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 44 +- + drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c | 285 ++ + drivers/gpu/drm/panel/panel-simple.c | 123 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 87 + + drivers/gpu/drm/panel/panel-truly-nt35597.c | 6 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 16 +- + drivers/gpu/drm/panfrost/Makefile | 2 - + drivers/gpu/drm/panfrost/panfrost_debugfs.c | 21 - + drivers/gpu/drm/panfrost/panfrost_debugfs.h | 14 - + drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 50 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panthor/Kconfig | 23 + + drivers/gpu/drm/panthor/Makefile | 14 + + drivers/gpu/drm/panthor/panthor_devfreq.c | 283 ++ + drivers/gpu/drm/panthor/panthor_devfreq.h | 21 + + drivers/gpu/drm/panthor/panthor_device.c | 561 ++++ + drivers/gpu/drm/panthor/panthor_device.h | 357 ++ + drivers/gpu/drm/panthor/panthor_drv.c | 1488 +++++++++ + drivers/gpu/drm/panthor/panthor_fw.c | 1362 ++++++++ + drivers/gpu/drm/panthor/panthor_fw.h | 503 +++ + drivers/gpu/drm/panthor/panthor_gem.c | 230 ++ + drivers/gpu/drm/panthor/panthor_gem.h | 142 + + drivers/gpu/drm/panthor/panthor_gpu.c | 482 +++ + drivers/gpu/drm/panthor/panthor_gpu.h | 52 + + drivers/gpu/drm/panthor/panthor_heap.c | 597 ++++ + drivers/gpu/drm/panthor/panthor_heap.h | 39 + + drivers/gpu/drm/panthor/panthor_mmu.c | 2774 ++++++++++++++++ + drivers/gpu/drm/panthor/panthor_mmu.h | 102 + + drivers/gpu/drm/panthor/panthor_regs.h | 239 ++ + drivers/gpu/drm/panthor/panthor_sched.c | 3499 ++++++++++++++++++++ + drivers/gpu/drm/panthor/panthor_sched.h | 50 + + drivers/gpu/drm/qxl/qxl_object.c | 26 +- + drivers/gpu/drm/qxl/qxl_object.h | 2 + + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/radeon/Kconfig | 8 +- + drivers/gpu/drm/radeon/r100.c | 1 + + drivers/gpu/drm/radeon/r300.c | 1 + + drivers/gpu/drm/radeon/r420.c | 1 + + drivers/gpu/drm/radeon/r600.c | 3 +- + drivers/gpu/drm/radeon/radeon.h | 1 - + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_fence.c | 1 + + drivers/gpu/drm/radeon/radeon_gem.c | 1 + + drivers/gpu/drm/radeon/radeon_ib.c | 2 + + drivers/gpu/drm/radeon/radeon_pm.c | 1 + + drivers/gpu/drm/radeon/radeon_prime.c | 11 - + drivers/gpu/drm/radeon/radeon_ring.c | 2 + + drivers/gpu/drm/radeon/radeon_ttm.c | 1 + + drivers/gpu/drm/radeon/rs400.c | 1 + + drivers/gpu/drm/radeon/rv515.c | 1 + + drivers/gpu/drm/renesas/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 3 - + drivers/gpu/drm/rockchip/Kconfig | 10 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 34 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 12 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 12 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 22 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 - + drivers/gpu/drm/sti/sti_drv.c | 1 + + drivers/gpu/drm/sun4i/Kconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 18 +- + drivers/gpu/drm/tegra/Kconfig | 8 +- + drivers/gpu/drm/tests/drm_buddy_test.c | 171 +- + drivers/gpu/drm/tidss/tidss_kms.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 - + drivers/gpu/drm/tiny/simpledrm.c | 16 + + drivers/gpu/drm/ttm/ttm_bo.c | 239 +- + drivers/gpu/drm/ttm/ttm_device.c | 1 + + drivers/gpu/drm/ttm/ttm_resource.c | 20 +- + drivers/gpu/drm/ttm/ttm_tt.c | 5 +- + drivers/gpu/drm/v3d/v3d_drv.c | 33 +- + drivers/gpu/drm/v3d/v3d_drv.h | 30 +- + drivers/gpu/drm/v3d/v3d_gem.c | 9 +- + drivers/gpu/drm/v3d/v3d_irq.c | 48 +- + drivers/gpu/drm/v3d/v3d_sched.c | 94 +- + drivers/gpu/drm/v3d/v3d_sysfs.c | 13 +- + drivers/gpu/drm/vc4/Kconfig | 10 +- + drivers/gpu/drm/vc4/vc4_drv.h | 1 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 48 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 7 +- + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 4 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 52 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 39 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 32 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 42 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 110 - + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 19 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 7 - + drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 632 ++++ + drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h | 75 + + drivers/gpu/drm/xe/Kconfig | 15 +- + drivers/gpu/drm/xe/Makefile | 17 +- + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 200 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 10 + + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 57 +- + .../gpu/drm/xe/compat-i915-headers/i915_fixed.h | 6 - + drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h | 9 - + .../drm/xe/compat-i915-headers/i915_gem_stolen.h | 9 +- + drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h | 26 - + .../gpu/drm/xe/compat-i915-headers/intel_uc_fw.h | 11 - + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 6 +- + drivers/gpu/drm/xe/display/intel_fb_bo.c | 8 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 16 +- + drivers/gpu/drm/xe/display/xe_display.c | 8 +- + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 4 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 39 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 240 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 7 +- + .../drm/xe/instructions/xe_gfx_state_commands.h | 18 + + .../gpu/drm/xe/instructions/xe_gfxpipe_commands.h | 3 + + drivers/gpu/drm/xe/instructions/xe_instr_defs.h | 1 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 3 - + drivers/gpu/drm/xe/regs/xe_gsc_regs.h | 7 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 65 +- + drivers/gpu/drm/xe/regs/xe_gtt_defs.h | 37 + + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 15 +- + drivers/gpu/drm/xe/regs/xe_reg_defs.h | 19 + + drivers/gpu/drm/xe/regs/xe_regs.h | 2 +- + drivers/gpu/drm/xe/regs/xe_sriov_regs.h | 3 + + drivers/gpu/drm/xe/tests/Makefile | 3 +- + drivers/gpu/drm/xe/tests/xe_bo.c | 12 +- + drivers/gpu/drm/xe/tests/xe_bo_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 57 +- + drivers/gpu/drm/xe/tests/xe_dma_buf_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c | 136 + + drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 10 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 27 +- + drivers/gpu/drm/xe/tests/xe_migrate_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_mocs.c | 96 +- + drivers/gpu/drm/xe/tests/xe_mocs_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_wa_test.c | 1 + + drivers/gpu/drm/xe/xe_bb.c | 6 +- + drivers/gpu/drm/xe/xe_bo.c | 137 +- + drivers/gpu/drm/xe/xe_bo.h | 74 +- + drivers/gpu/drm/xe/xe_bo_evict.c | 4 +- + drivers/gpu/drm/xe/xe_debugfs.c | 24 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 47 +- + drivers/gpu/drm/xe/xe_devcoredump.h | 6 + + drivers/gpu/drm/xe/xe_device.c | 225 +- + drivers/gpu/drm/xe/xe_device.h | 9 - + drivers/gpu/drm/xe/xe_device_sysfs.c | 16 +- + drivers/gpu/drm/xe/xe_device_sysfs.h | 2 +- + drivers/gpu/drm/xe/xe_device_types.h | 26 +- + drivers/gpu/drm/xe/xe_dma_buf.c | 7 +- + drivers/gpu/drm/xe/xe_drm_client.c | 8 +- + drivers/gpu/drm/xe/xe_exec.c | 14 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 74 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 8 +- + drivers/gpu/drm/xe/xe_ggtt.c | 138 +- + drivers/gpu/drm/xe/xe_ggtt.h | 8 +- + drivers/gpu/drm/xe/xe_gsc.c | 100 +- + drivers/gpu/drm/xe/xe_gsc.h | 2 + + drivers/gpu/drm/xe/xe_gsc_proxy.c | 15 +- + drivers/gpu/drm/xe/xe_gsc_proxy.h | 1 + + drivers/gpu/drm/xe/xe_gsc_submit.c | 15 + + drivers/gpu/drm/xe/xe_gsc_submit.h | 1 + + drivers/gpu/drm/xe/xe_gsc_types.h | 1 + + drivers/gpu/drm/xe/xe_gt.c | 59 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 5 - + drivers/gpu/drm/xe/xe_gt_clock.h | 2 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 242 +- + drivers/gpu/drm/xe/xe_gt_debugfs.h | 2 + + drivers/gpu/drm/xe/xe_gt_freq.c | 63 +- + drivers/gpu/drm/xe/xe_gt_freq.h | 2 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 43 +- + drivers/gpu/drm/xe/xe_gt_idle.h | 2 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 39 +- + drivers/gpu/drm/xe/xe_gt_mcr.h | 14 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 52 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 20 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 1977 +++++++++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 56 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 54 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 257 ++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h | 27 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_helpers.h | 35 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 418 +++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.h | 25 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy_types.h | 31 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 34 + + drivers/gpu/drm/xe/xe_gt_sysfs.c | 14 +- + drivers/gpu/drm/xe/xe_gt_sysfs.h | 2 +- + drivers/gpu/drm/xe/xe_gt_throttle_sysfs.c | 16 +- + drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h | 2 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 43 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 2 +- + drivers/gpu/drm/xe/xe_gt_topology.c | 115 +- + drivers/gpu/drm/xe/xe_gt_topology.h | 11 + + drivers/gpu/drm/xe/xe_gt_types.h | 22 +- + drivers/gpu/drm/xe/xe_guc.c | 122 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 137 +- + drivers/gpu/drm/xe/xe_guc_ads_types.h | 2 + + drivers/gpu/drm/xe/xe_guc_ct.c | 131 +- + drivers/gpu/drm/xe/xe_guc_debugfs.c | 9 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 7 +- + drivers/gpu/drm/xe/xe_guc_hwconfig.c | 7 +- + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 279 ++ + drivers/gpu/drm/xe/xe_guc_id_mgr.h | 22 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 134 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.h | 51 + + drivers/gpu/drm/xe/xe_guc_log.c | 5 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 116 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 230 +- + drivers/gpu/drm/xe/xe_guc_submit.h | 6 +- + drivers/gpu/drm/xe/xe_guc_submit_types.h | 13 +- + drivers/gpu/drm/xe/xe_guc_types.h | 21 +- + drivers/gpu/drm/xe/xe_hmm.c | 253 ++ + drivers/gpu/drm/xe/xe_hmm.h | 11 + + drivers/gpu/drm/xe/xe_huc.c | 4 +- + drivers/gpu/drm/xe/xe_huc_debugfs.c | 5 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 46 +- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 155 +- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.h | 7 + + drivers/gpu/drm/xe/xe_hw_fence.c | 2 +- + drivers/gpu/drm/xe/xe_hwmon.c | 266 +- + drivers/gpu/drm/xe/xe_irq.c | 3 +- + drivers/gpu/drm/xe/xe_lmtt.c | 6 +- + drivers/gpu/drm/xe/xe_lrc.c | 169 +- + drivers/gpu/drm/xe/xe_lrc.h | 5 + + drivers/gpu/drm/xe/xe_lrc_types.h | 2 + + drivers/gpu/drm/xe/xe_memirq.c | 9 +- + drivers/gpu/drm/xe/xe_migrate.c | 8 +- + drivers/gpu/drm/xe/xe_mmio.c | 148 +- + drivers/gpu/drm/xe/xe_mmio.h | 82 +- + drivers/gpu/drm/xe/xe_mocs.c | 66 +- + drivers/gpu/drm/xe/xe_module.c | 7 + + drivers/gpu/drm/xe/xe_module.h | 3 + + drivers/gpu/drm/xe/xe_pat.c | 23 +- + drivers/gpu/drm/xe/xe_pci.c | 44 +- + drivers/gpu/drm/xe/xe_pcode.c | 119 +- + drivers/gpu/drm/xe/xe_pcode.h | 6 +- + drivers/gpu/drm/xe/xe_platform_types.h | 1 + + drivers/gpu/drm/xe/xe_pm.c | 331 +- + drivers/gpu/drm/xe/xe_pm.h | 13 +- + drivers/gpu/drm/xe/xe_pt.c | 13 +- + drivers/gpu/drm/xe/xe_query.c | 53 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 11 +- + drivers/gpu/drm/xe/xe_sa.c | 5 +- + drivers/gpu/drm/xe/xe_sched_job.c | 23 +- + drivers/gpu/drm/xe/xe_sched_job.h | 3 + + drivers/gpu/drm/xe/xe_sriov.c | 62 +- + drivers/gpu/drm/xe/xe_sriov.h | 8 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 104 + + drivers/gpu/drm/xe/xe_sriov_pf.h | 30 + + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 46 + + drivers/gpu/drm/xe/xe_sriov_types.h | 19 + + drivers/gpu/drm/xe/xe_sync.c | 7 +- + drivers/gpu/drm/xe/xe_sync.h | 1 - + drivers/gpu/drm/xe/xe_tile.c | 17 +- + drivers/gpu/drm/xe/xe_tile_sysfs.c | 17 +- + drivers/gpu/drm/xe/xe_tile_sysfs.h | 2 +- + drivers/gpu/drm/xe/xe_trace.h | 6 +- + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 15 +- + drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 5 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 18 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.h | 1 + + drivers/gpu/drm/xe/xe_tuning.c | 10 +- + drivers/gpu/drm/xe/xe_uc.c | 11 - + drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 + + drivers/gpu/drm/xe/xe_uc_fw.c | 51 +- + drivers/gpu/drm/xe/xe_uc_fw.h | 8 +- + drivers/gpu/drm/xe/xe_uc_fw_types.h | 3 +- + drivers/gpu/drm/xe/xe_vm.c | 210 +- + drivers/gpu/drm/xe/xe_vm_types.h | 7 - + drivers/gpu/drm/xe/xe_vram_freq.c | 20 +- + drivers/gpu/drm/xe/xe_vram_freq.h | 2 +- + drivers/gpu/drm/xe/xe_wa.c | 135 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 11 +- + drivers/gpu/drm/xlnx/Kconfig | 8 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 229 +- + drivers/gpu/drm/xlnx/zynqmp_disp.h | 17 +- + drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 8 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 85 +- + drivers/gpu/drm/xlnx/zynqmp_kms.c | 2 +- + drivers/video/fbdev/core/Kconfig | 6 + + include/drm/amd_asic_type.h | 3 + + include/drm/bridge/samsung-dsim.h | 4 +- + include/drm/display/drm_dp.h | 11 + + include/drm/display/drm_dp_helper.h | 51 +- + include/drm/display/drm_dp_mst_helper.h | 31 +- + include/drm/display/drm_dsc.h | 3 - + include/drm/drm_buddy.h | 16 +- + include/drm/drm_client.h | 10 + + include/drm/drm_debugfs_crc.h | 8 +- + include/drm/drm_edid.h | 45 +- + include/drm/drm_encoder_slave.h | 91 +- + include/drm/drm_fb_dma_helper.h | 5 + + include/drm/drm_format_helper.h | 1 + + include/drm/drm_gem.h | 3 + + include/drm/drm_gem_shmem_helper.h | 7 +- + include/drm/drm_gem_vram_helper.h | 1 - + include/drm/drm_kunit_helpers.h | 2 +- + include/drm/drm_lease.h | 2 + + include/drm/drm_mipi_dsi.h | 15 +- + include/drm/drm_mode_config.h | 15 + + include/drm/drm_modeset_helper_vtables.h | 39 + + include/drm/drm_of.h | 1 + + include/drm/drm_panic.h | 152 + + include/drm/drm_plane.h | 10 + + include/drm/drm_print.h | 4 +- + include/drm/drm_probe_helper.h | 6 + + include/drm/drm_suballoc.h | 2 +- + include/drm/drm_vblank.h | 1 + + include/drm/gma_drm.h | 13 - + include/drm/i2c/ch7006.h | 1 + + include/drm/i2c/sil164.h | 1 + + include/drm/i915_component.h | 2 +- + include/drm/i915_gsc_proxy_mei_interface.h | 4 +- + include/drm/i915_hdcp_interface.h | 18 +- + include/drm/i915_pciids.h | 4 +- + include/drm/i915_pxp_tee_interface.h | 27 +- + include/drm/ttm/ttm_bo.h | 17 +- + include/drm/ttm/ttm_caching.h | 2 + + include/drm/ttm/ttm_execbuf_util.h | 7 +- + include/drm/ttm/ttm_kmap_iter.h | 4 +- + include/drm/ttm/ttm_pool.h | 5 +- + include/drm/ttm/ttm_resource.h | 6 +- + include/drm/xe_pciids.h | 7 +- + include/linux/devcoredump.h | 5 + + include/linux/dma-buf.h | 2 + + include/linux/fb.h | 4 + + include/uapi/drm/drm_mode.h | 11 + + include/uapi/drm/i915_drm.h | 16 +- + include/uapi/drm/nouveau_drm.h | 22 + + include/uapi/drm/panthor_drm.h | 945 ++++++ + include/uapi/drm/xe_drm.h | 25 +- + 1095 files changed, 48753 insertions(+), 12463 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-panfrost-profiling + create mode 100644 Documentation/devicetree/bindings/display/bridge/microchip,sam9x75-lvds.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/lg,sw43408.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common-dual.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-valhall-csf.yaml + create mode 100644 Documentation/gpu/amdgpu/debugging.rst + create mode 100644 drivers/accel/qaic/qaic_debugfs.c + create mode 100644 drivers/accel/qaic/qaic_debugfs.h + create mode 100644 drivers/accel/qaic/sahara.c + create mode 100644 drivers/accel/qaic/sahara.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_cm.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_dscl.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp_cm.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp_cm.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.h (87%) + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_hwseq.c + rename drivers/gpu/drm/amd/display/dc/{dcn35/dcn35_dpp.c => hwss/dcn351/dcn351_hwseq.h} (56%) + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/vpg.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v14_0_2_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0_2_pptable.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.h + rename drivers/gpu/drm/ast/{ast_i2c.c => ast_ddc.c} (52%) + create mode 100644 drivers/gpu/drm/ast/ast_ddc.h + create mode 100644 drivers/gpu/drm/bridge/microchip-lvds.c + rename include/drm/drm_displayid.h => drivers/gpu/drm/drm_displayid_internal.h (98%) + create mode 100644 drivers/gpu/drm/drm_panic.c + create mode 100644 drivers/gpu/drm/i915/display/bxt_dpio_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_conversion.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dmc_wl.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dmc_wl.h + rename drivers/gpu/drm/i915/{i915_fixed.h => display/intel_fixed.h} (100%) + rename drivers/gpu/drm/mediatek/{mtk_drm_crtc.c => mtk_crtc.c} (82%) + create mode 100644 drivers/gpu/drm/mediatek/mtk_crtc.h + rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.c => mtk_ddp_comp.c} (94%) + rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.h => mtk_ddp_comp.h} (98%) + delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.h + rename drivers/gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} (76%) + rename drivers/gpu/drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} (62%) + rename drivers/gpu/drm/mediatek/{mtk_drm_plane.c => mtk_plane.c} (94%) + rename drivers/gpu/drm/mediatek/{mtk_drm_plane.h => mtk_plane.h} (95%) + create mode 100644 drivers/gpu/drm/panel/panel-lg-sw43408.c + create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm69380.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c + delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.c + delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.h + create mode 100644 drivers/gpu/drm/panthor/Kconfig + create mode 100644 drivers/gpu/drm/panthor/Makefile + create mode 100644 drivers/gpu/drm/panthor/panthor_devfreq.c + create mode 100644 drivers/gpu/drm/panthor/panthor_devfreq.h + create mode 100644 drivers/gpu/drm/panthor/panthor_device.c + create mode 100644 drivers/gpu/drm/panthor/panthor_device.h + create mode 100644 drivers/gpu/drm/panthor/panthor_drv.c + create mode 100644 drivers/gpu/drm/panthor/panthor_fw.c + create mode 100644 drivers/gpu/drm/panthor/panthor_fw.h + create mode 100644 drivers/gpu/drm/panthor/panthor_gem.c + create mode 100644 drivers/gpu/drm/panthor/panthor_gem.h + create mode 100644 drivers/gpu/drm/panthor/panthor_gpu.c + create mode 100644 drivers/gpu/drm/panthor/panthor_gpu.h + create mode 100644 drivers/gpu/drm/panthor/panthor_heap.c + create mode 100644 drivers/gpu/drm/panthor/panthor_heap.h + create mode 100644 drivers/gpu/drm/panthor/panthor_mmu.c + create mode 100644 drivers/gpu/drm/panthor/panthor_mmu.h + create mode 100644 drivers/gpu/drm/panthor/panthor_regs.h + create mode 100644 drivers/gpu/drm/panthor/panthor_sched.c + create mode 100644 drivers/gpu/drm/panthor/panthor_sched.h + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h + create mode 100644 drivers/gpu/drm/xe/instructions/xe_gfx_state_commands.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_gtt_defs.h + create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_live_test_mod.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_helpers.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_policy_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_id_mgr.c + create mode 100644 drivers/gpu/drm/xe/xe_guc_id_mgr.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_helpers.c + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_helpers.h + create mode 100644 drivers/gpu/drm/xe/xe_hmm.c + create mode 100644 drivers/gpu/drm/xe/xe_hmm.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_helpers.h + create mode 100644 include/drm/drm_panic.h + delete mode 100644 include/drm/gma_drm.h + create mode 100644 include/uapi/drm/panthor_drm.h +Merging drm-exynos/for-linux-next (2236a61bd491 Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (75b68f22e39a drm: ci: fix the xfails for apq8016) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 1 - + drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 13 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 6 + + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 363 ++++++++++++++++++++-- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +- + drivers/gpu/drm/tiny/ili9225.c | 1 - + drivers/gpu/drm/tiny/mi0283qt.c | 1 - + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 1 - + drivers/gpu/drm/tiny/st7586.c | 1 - + drivers/gpu/drm/xlnx/zynqmp_disp.c | 50 ++- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 25 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 7 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 1 + + drivers/gpu/drm/xlnx/zynqmp_kms.h | 4 +- + 15 files changed, 384 insertions(+), 94 deletions(-) +Merging amdgpu/drm-next (aa463cc850c4 drm/amd/display: Fix CFLAGS for dml2_core_dcn4_calcs.o) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dml2/Makefile +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 34 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 239 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 47 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 119 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 22 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 1 + + drivers/gpu/drm/amd/amdgpu/cik.c | 2 + + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 145 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 2 + + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 + + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 2 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 101 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/nv.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/si.c | 2 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 + + drivers/gpu/drm/amd/amdgpu/soc21.c | 6 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 219 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 15 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 + + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 + + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 3 + + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 43 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 12 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 15 + + drivers/gpu/drm/amd/display/dc/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 109 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 2 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 2 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 16 + + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 8 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 9 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn401/dalsmc.h | 46 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 1006 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 22 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c | 120 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h | 21 + + .../dc/clk_mgr/dcn401/dcn401_smu14_driver_if.h | 66 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 265 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 43 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 56 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 16 + + drivers/gpu/drm/amd/display/dc/dc.h | 47 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 176 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 3 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 50 +- + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 170 + + drivers/gpu/drm/amd/display/dc/dc_spl_translate.h | 22 + + drivers/gpu/drm/amd/display/dc/dc_state_priv.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 77 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 64 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 117 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 8 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 4 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 47 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 27 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 35 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h | 3 + + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 4 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h | 6 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 6 + + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.h | 2 + + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 8 +- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 6 +- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.h | 10 +- + .../display/dc/dcn32/dcn32_dio_stream_encoder.h | 5 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 2 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 3 + + .../display/dc/dcn321/dcn321_dio_link_encoder.c | 8 +- + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.h | 12 +- + drivers/gpu/drm/amd/display/dc/dcn401/Makefile | 14 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_dccg.c | 846 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_dccg.h | 205 + + .../display/dc/dcn401/dcn401_dio_link_encoder.c | 322 + + .../display/dc/dcn401/dcn401_dio_link_encoder.h | 134 + + .../display/dc/dcn401/dcn401_dio_stream_encoder.c | 895 + + .../display/dc/dcn401/dcn401_dio_stream_encoder.h | 217 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_hubbub.c | 933 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_hubbub.h | 192 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_hubp.c | 1027 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_hubp.h | 331 + + drivers/gpu/drm/amd/display/dc/dcn401/dcn401_mpc.c | 645 + + drivers/gpu/drm/amd/display/dc/dcn401/dcn401_mpc.h | 234 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 3 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 3 - + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 2 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.c | 239 + + .../gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.h | 14 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 80 + + .../drm/amd/display/dc/dml2/display_mode_core.c | 4 +- + .../display/dc/dml2/display_mode_core_structs.h | 1 + + .../dc/dml2/dml21/dml21_translation_helper.c | 1155 + + .../dc/dml2/dml21/dml21_translation_helper.h | 29 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 531 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.h | 50 + + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 425 + + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.h | 67 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h | 401 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 352 + + .../dc/dml2/dml21/inc/dml2_external_lib_deps.h | 10 + + .../drm/amd/display/dc/dml2/dml21/inc/dml_top.h | 47 + + .../dc/dml2/dml21/inc/dml_top_dchub_registers.h | 185 + + .../dc/dml2/dml21/inc/dml_top_display_cfg_types.h | 502 + + .../dc/dml2/dml21/inc/dml_top_policy_types.h | 14 + + .../dml2/dml21/inc/dml_top_soc_parameter_types.h | 193 + + .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 718 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 628 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h | 16 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 12269 ++ + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 39 + + .../dml2/dml21/src/dml2_core/dml2_core_factory.c | 38 + + .../dml2/dml21/src/dml2_core/dml2_core_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.c | 12411 ++ + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.h | 38 + + .../dml21/src/dml2_core/dml2_core_shared_types.h | 1948 + + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 644 + + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 17 + + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 50 + + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c | 156 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.h | 14 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c | 40 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c | 688 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.h | 23 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.c | 1250 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.h | 25 + + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 2060 + + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h | 27 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c | 86 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.h | 14 + + .../src/dml2_standalone_libraries/lib_float_math.c | 140 + + .../src/dml2_standalone_libraries/lib_float_math.h | 25 + + .../dml21/src/dml2_top/dml2_top_optimization.c | 309 + + .../dml21/src/dml2_top/dml2_top_optimization.h | 34 + + .../display/dc/dml2/dml21/src/dml2_top/dml_top.c | 329 + + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.c | 545 + + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.h | 24 + + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.c | 32 + + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 18 + + .../dml21/src/inc/dml2_internal_shared_types.h | 981 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 82 +- + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 20 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 130 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 30 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 14 + + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 8 +- + .../drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 2 +- + .../gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.c | 56 + + .../gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h | 9 +- + .../drm/amd/display/dc/dpp/dcn20/dcn20_dpp_cm.c | 2 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.h | 4 +- + .../drm/amd/display/dc/dpp/dcn30/dcn30_dpp_cm.c | 2 +- + .../gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.c | 73 + + .../gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h | 8 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c | 432 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 725 + + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 303 + + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 968 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 8 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 109 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.h | 11 + + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 747 + + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h | 337 + + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 10 + + .../amd/display/dc/gpio/dcn401/hw_factory_dcn401.c | 252 + + .../amd/display/dc/gpio/dcn401/hw_factory_dcn401.h | 11 + + .../display/dc/gpio/dcn401/hw_translate_dcn401.c | 335 + + .../display/dc/gpio/dcn401/hw_translate_dcn401.h | 13 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 6 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 4 + + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 5 + + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 24 + + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 4 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 15 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 28 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 2 + + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 1545 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 76 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 151 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.h | 12 + + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 22 + + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 21 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 6 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 55 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 15 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 56 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 36 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 30 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 8 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 8 +- + .../amd/display/dc/irq/dcn401/irq_service_dcn401.c | 411 + + .../amd/display/dc/irq/dcn401/irq_service_dcn401.h | 13 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 4 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 8 +- + .../display/dc/link/protocols/link_dp_capability.c | 16 +- + .../dc/link/protocols/link_dp_irq_handler.c | 10 +- + .../display/dc/link/protocols/link_dp_training.c | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 4 +- + .../drm/amd/display/dc/link/protocols/link_hpd.c | 2 +- + drivers/gpu/drm/amd/display/dc/optc/Makefile | 6 + + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 11 +- + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 479 + + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 167 + + drivers/gpu/drm/amd/display/dc/resource/Makefile | 8 + + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 11 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 3 + + .../display/dc/resource/dcn303/dcn303_resource.c | 2 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 5 + + .../display/dc/resource/dcn314/dcn314_resource.c | 5 + + .../display/dc/resource/dcn315/dcn315_resource.c | 2 + + .../display/dc/resource/dcn316/dcn316_resource.c | 2 + + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 6 + + .../display/dc/resource/dcn321/dcn321_resource.c | 2 + + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 2 + + .../display/dc/resource/dcn351/dcn351_resource.c | 2 + + .../display/dc/resource/dcn401/dcn401_resource.c | 2118 + + .../display/dc/resource/dcn401/dcn401_resource.h | 581 + + drivers/gpu/drm/amd/display/dc/spl/Makefile | 33 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 1354 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 24 + + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.c | 350 + + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.h | 17 + + .../drm/amd/display/dc/spl/dc_spl_scl_filters.c | 1425 + + .../drm/amd/display/dc/spl/dc_spl_scl_filters.h | 59 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h | 458 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 44 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 241 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 603 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h | 287 + + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 1 - + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 87 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 11 + + drivers/gpu/drm/amd/display/include/dal_types.h | 2 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 8 + + drivers/gpu/drm/amd/include/amd_shared.h | 3 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 112 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 61 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 90 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 44 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 16 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 16 + + .../amd/include/asic_reg/dcn/dcn_3_1_5_offset.h | 4 + + .../amd/include/asic_reg/dcn/dcn_3_1_5_sh_mask.h | 10 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 28 + + .../amd/include/asic_reg/dcn/dcn_4_1_0_offset.h | 16569 ++ + .../amd/include/asic_reg/dcn/dcn_4_1_0_sh_mask.h | 145742 ++++++++++++++++++ + .../amd/include/asic_reg/dpcs/dpcs_3_0_0_offset.h | 24 + + .../amd/include/asic_reg/dpcs/dpcs_3_0_0_sh_mask.h | 4 +- + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 12 + + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 17 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 2 + + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 2 + + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 2 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 2 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 5 + + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 14 +- + include/uapi/drm/amdgpu_drm.h | 14 +- + include/uapi/drm/drm_fourcc.h | 19 + + 371 files changed, 228467 insertions(+), 512 deletions(-) + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dalsmc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_smu14_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_spl_translate.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_spl_translate.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml2_external_lib_deps.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_dchub_registers.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_display_cfg_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_policy_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_soc_parameter_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries/lib_float_math.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries/lib_float_math.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top_mcache.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top_mcache.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_debug.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_debug.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_internal_shared_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_translate_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_translate_dcn401.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.h + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_1_0_sh_mask.h +Merging drm-intel/for-linux-next (41b088a26803 drm/i915/display: split out intel_sprite_regs.h from i915_reg.h) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/drm_client.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/xe/display/xe_display.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_client.c | 13 + + drivers/gpu/drm/i915/display/intel_audio_regs.h | 16 + + drivers/gpu/drm/i915/display/intel_color_regs.h | 42 +- + drivers/gpu/drm/i915/display/intel_display.c | 1 - + .../gpu/drm/i915/display/intel_display_driver.c | 24 +- + .../gpu/drm/i915/display/intel_display_reg_defs.h | 22 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 1 + + drivers/gpu/drm/i915/display/intel_fbc_regs.h | 120 ++++ + drivers/gpu/drm/i915/display/intel_fbdev.c | 265 ++++---- + drivers/gpu/drm/i915/display/intel_fbdev.h | 29 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 38 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1 + + drivers/gpu/drm/i915/display/intel_sprite_regs.h | 348 ++++++++++ + drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 1 + + drivers/gpu/drm/i915/gvt/fb_decoder.c | 5 +- + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 22 - + drivers/gpu/drm/i915/i915_reg.h | 757 ++++----------------- + drivers/gpu/drm/i915/intel_clock_gating.c | 1 + + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 + + drivers/gpu/drm/xe/display/xe_display.c | 11 - + drivers/gpu/drm/xe/xe_device.c | 1 + + 25 files changed, 857 insertions(+), 869 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_fbc_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_sprite_regs.h +Merging drm-tegra/for-next (2429b3c529da 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 (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 1 + + .../bindings/display/msm/qcom,sm6350-mdss.yaml | 9 + + drivers/gpu/drm/msm/.gitignore | 1 + + drivers/gpu/drm/msm/Makefile | 99 +- + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 3251 ----- + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.h | 4 + + .../drm/msm/{msm_gpummu.c => adreno/a2xx_gpummu.c} | 45 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 3268 ----- + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 4379 ------- + drivers/gpu/drm/msm/adreno/a5xx.xml.h | 5572 --------- + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 11858 ------------------- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 12 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 422 - + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 4 +- + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 539 - + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 2803 ----- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 24 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 2 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 - + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 8 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 660 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 25 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 30 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 124 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 40 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 13 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 91 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 56 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 8 + + drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h | 1181 -- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 1 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 4 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 129 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h | 1979 ---- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h | 11 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 7 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 1 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 125 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h | 2 +- + drivers/gpu/drm/msm/disp/mdp_common.xml.h | 111 - + drivers/gpu/drm/msm/disp/mdp_format.c | 630 +- + drivers/gpu/drm/msm/disp/mdp_format.h | 77 + + drivers/gpu/drm/msm/disp/mdp_kms.h | 18 +- + drivers/gpu/drm/msm/dp/dp_audio.c | 25 +- + drivers/gpu/drm/msm/dp/dp_aux.c | 39 +- + drivers/gpu/drm/msm/dp/dp_aux.h | 1 + + drivers/gpu/drm/msm/dp/dp_catalog.c | 71 +- + drivers/gpu/drm/msm/dp/dp_catalog.h | 52 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 23 +- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - + drivers/gpu/drm/msm/dp/dp_debug.c | 61 +- + drivers/gpu/drm/msm/dp/dp_debug.h | 38 +- + drivers/gpu/drm/msm/dp/dp_display.c | 105 +- + drivers/gpu/drm/msm/dp/dp_display.h | 3 - + drivers/gpu/drm/msm/dp/dp_drm.c | 2 - + drivers/gpu/drm/msm/dp/dp_link.c | 26 +- + drivers/gpu/drm/msm/dp/dp_link.h | 15 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 14 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 3 - + drivers/gpu/drm/msm/dsi/dsi.c | 26 +- + drivers/gpu/drm/msm/dsi/dsi.h | 7 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 790 -- + drivers/gpu/drm/msm/dsi/dsi_host.c | 20 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 79 +- + drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h | 227 - + drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h | 309 - + drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h | 237 - + drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h | 384 - + drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h | 286 - + drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h | 483 - + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 131 - + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 8 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 70 - + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 10 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 1399 --- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 4 +- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 61 - + drivers/gpu/drm/msm/msm_drv.c | 3 +- + drivers/gpu/drm/msm/msm_drv.h | 11 +- + drivers/gpu/drm/msm/msm_fb.c | 12 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.h | 12 +- + drivers/gpu/drm/msm/msm_kms.h | 4 - + drivers/gpu/drm/msm/msm_mmu.h | 5 - + drivers/gpu/drm/msm/registers/.gitignore | 4 + + drivers/gpu/drm/msm/registers/adreno/a2xx.xml | 1865 +++ + drivers/gpu/drm/msm/registers/adreno/a3xx.xml | 1751 +++ + drivers/gpu/drm/msm/registers/adreno/a4xx.xml | 2409 ++++ + drivers/gpu/drm/msm/registers/adreno/a5xx.xml | 3039 +++++ + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 4970 ++++++++ + drivers/gpu/drm/msm/registers/adreno/a6xx_gmu.xml | 228 + + .../gpu/drm/msm/registers/adreno/adreno_common.xml | 400 + + .../gpu/drm/msm/registers/adreno/adreno_pm4.xml | 2268 ++++ + drivers/gpu/drm/msm/registers/display/dsi.xml | 390 + + .../gpu/drm/msm/registers/display/dsi_phy_10nm.xml | 102 + + .../gpu/drm/msm/registers/display/dsi_phy_14nm.xml | 135 + + .../gpu/drm/msm/registers/display/dsi_phy_20nm.xml | 100 + + .../gpu/drm/msm/registers/display/dsi_phy_28nm.xml | 180 + + .../msm/registers/display/dsi_phy_28nm_8960.xml | 134 + + .../gpu/drm/msm/registers/display/dsi_phy_7nm.xml | 230 + + drivers/gpu/drm/msm/registers/display/edp.xml | 239 + + drivers/gpu/drm/msm/registers/display/hdmi.xml | 1015 ++ + drivers/gpu/drm/msm/registers/display/mdp4.xml | 504 + + drivers/gpu/drm/msm/registers/display/mdp5.xml | 806 ++ + .../gpu/drm/msm/registers/display/mdp_common.xml | 90 + + drivers/gpu/drm/msm/registers/display/msm.xml | 32 + + drivers/gpu/drm/msm/registers/display/sfpb.xml | 17 + + .../gpu/drm/msm/registers/freedreno_copyright.xml | 40 + + drivers/gpu/drm/msm/registers/gen_header.py | 962 ++ + drivers/gpu/drm/msm/registers/rules-fd.xsd | 404 + + drivers/phy/qualcomm/phy-qcom-edp.c | 76 +- + include/linux/phy/phy-dp.h | 3 + + 133 files changed, 23823 insertions(+), 41385 deletions(-) + create mode 100644 drivers/gpu/drm/msm/.gitignore + delete mode 100644 drivers/gpu/drm/msm/adreno/a2xx.xml.h + rename drivers/gpu/drm/msm/{msm_gpummu.c => adreno/a2xx_gpummu.c} (67%) + delete mode 100644 drivers/gpu/drm/msm/adreno/a3xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a4xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a5xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a6xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/adreno_common.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h + delete mode 100644 drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h + delete mode 100644 drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h + delete mode 100644 drivers/gpu/drm/msm/disp/mdp_common.xml.h + create mode 100644 drivers/gpu/drm/msm/disp/mdp_format.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/mmss_cc.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/sfpb.xml.h + delete mode 100644 drivers/gpu/drm/msm/hdmi/hdmi.xml.h + delete mode 100644 drivers/gpu/drm/msm/hdmi/qfprom.xml.h + create mode 100644 drivers/gpu/drm/msm/registers/.gitignore + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a2xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a3xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a4xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a5xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_gmu.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/adreno_common.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/adreno_pm4.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_10nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_14nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_20nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_28nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_28nm_8960.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/edp.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/hdmi.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/mdp4.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/mdp5.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/mdp_common.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/msm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/sfpb.xml + create mode 100644 drivers/gpu/drm/msm/registers/freedreno_copyright.xml + create mode 100644 drivers/gpu/drm/msm/registers/gen_header.py + create mode 100644 drivers/gpu/drm/msm/registers/rules-fd.xsd +Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane) +$ 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 drm-xe/drm-xe-next (4caf410766ad drm/xe: Merge 16021540221 and 18034896535 WAs) +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +Auto-merging drivers/gpu/drm/xe/xe_debugfs.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_device_types.h +Auto-merging drivers/gpu/drm/xe/xe_gt_debugfs.c +Resolved 'drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e54104de6e4f] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/xe/Makefile | 2 + + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 26 +- + drivers/gpu/drm/xe/abi/guc_relay_actions_abi.h | 170 ++++- + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 3 +- + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 16 + + drivers/gpu/drm/xe/regs/xe_sriov_regs.h | 3 + + .../gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c | 232 +++++++ + drivers/gpu/drm/xe/tests/xe_migrate.c | 86 --- + drivers/gpu/drm/xe/xe_debugfs.c | 55 ++ + drivers/gpu/drm/xe/xe_device.c | 44 +- + drivers/gpu/drm/xe/xe_device.h | 7 + + drivers/gpu/drm/xe/xe_device_types.h | 8 + + drivers/gpu/drm/xe/xe_exec_queue.h | 9 + + drivers/gpu/drm/xe/xe_gt.c | 15 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 5 + + drivers/gpu/drm/xe/xe_gt_mcr.h | 24 + + drivers/gpu/drm/xe/xe_gt_pagefault.c | 16 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 32 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 5 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 18 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 348 ++++++++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h | 18 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 550 ++++++++++++++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h | 36 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service_types.h | 52 ++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 5 + + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 159 +++-- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 3 + + drivers/gpu/drm/xe/xe_gt_topology.c | 10 + + drivers/gpu/drm/xe/xe_gt_topology.h | 3 + + drivers/gpu/drm/xe/xe_guc.c | 48 +- + drivers/gpu/drm/xe/xe_guc.h | 2 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 65 +- + drivers/gpu/drm/xe/xe_guc_ads.h | 1 + + drivers/gpu/drm/xe/xe_guc_db_mgr.c | 3 +- + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 3 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 3 + + drivers/gpu/drm/xe/xe_guc_relay.c | 8 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 148 +++-- + drivers/gpu/drm/xe/xe_guc_submit.h | 2 +- + drivers/gpu/drm/xe/xe_guc_types.h | 9 - + drivers/gpu/drm/xe/xe_hw_engine.c | 134 +++- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 20 +- + drivers/gpu/drm/xe/xe_lrc.c | 4 +- + drivers/gpu/drm/xe/xe_mmio.c | 38 +- + drivers/gpu/drm/xe/xe_mmio.h | 7 + + drivers/gpu/drm/xe/xe_module.c | 5 + + drivers/gpu/drm/xe/xe_module.h | 1 + + drivers/gpu/drm/xe/xe_pm.c | 2 +- + drivers/gpu/drm/xe/xe_preempt_fence.c | 14 +- + drivers/gpu/drm/xe/xe_pt.c | 25 +- + drivers/gpu/drm/xe/xe_sync.c | 15 + + drivers/gpu/drm/xe/xe_sync.h | 1 + + drivers/gpu/drm/xe/xe_uc.c | 12 +- + drivers/gpu/drm/xe/xe_uc.h | 2 +- + drivers/gpu/drm/xe/xe_vm.c | 729 +++++++++++++-------- + drivers/gpu/drm/xe/xe_vm.h | 2 + + drivers/gpu/drm/xe/xe_vm_types.h | 33 +- + drivers/gpu/drm/xe/xe_wa.c | 21 +- + 60 files changed, 2713 insertions(+), 605 deletions(-) + create mode 100644 drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service_types.h +Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values) +$ 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 (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node)) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/Kconfig +Merge made by the 'ort' strategy. + drivers/video/fbdev/Kconfig | 26 +++++++++++++------------- + drivers/video/fbdev/au1200fb.c | 2 +- + drivers/video/fbdev/fsl-diu-fb.c | 2 +- + drivers/video/fbdev/offb.c | 3 +-- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 20 +------------------- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 3 ++- + drivers/video/fbdev/pxafb.c | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 5 ++++- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 +- + drivers/video/fbdev/sis/init301.c | 3 +-- + drivers/video/fbdev/uvesafb.c | 2 +- + drivers/video/hdmi.c | 10 ++-------- + drivers/video/logo/pnmtologo.c | 2 -- + include/video/omapfb_dss.h | 3 --- + 17 files changed, 35 insertions(+), 59 deletions(-) +Merging regmap/for-next (991b5e2aad87 regmap: kunit: Fix an NULL vs IS_ERR() check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/internal.h | 14 +- + drivers/base/regmap/regcache-maple.c | 2 +- + drivers/base/regmap/regmap-i3c.c | 2 +- + drivers/base/regmap/regmap-kunit.c | 994 ++++++++++++++++++++++++++--------- + drivers/base/regmap/regmap-mdio.c | 2 +- + drivers/base/regmap/regmap-ram.c | 5 +- + drivers/base/regmap/regmap-raw-ram.c | 5 +- + drivers/base/regmap/regmap-sdw-mbq.c | 2 +- + drivers/base/regmap/regmap-sdw.c | 2 +- + drivers/base/regmap/regmap-spi.c | 1 + + 10 files changed, 771 insertions(+), 258 deletions(-) +Merging sound/for-next (6b844f0626fc Merge branch 'topic/emu10k1-fix' into for-next) +$ 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/hda/cs35l41_hda.c +Auto-merging sound/pci/hda/patch_realtek.c +Merge made by the 'ort' strategy. + include/sound/cs35l41.h | 5 + + include/sound/emu10k1.h | 33 +- + include/sound/hdaudio.h | 1 + + include/sound/pcm.h | 5 + + include/sound/soundfont.h | 2 +- + sound/core/control_led.c | 15 +- + sound/core/pcm_native.c | 2 +- + sound/core/seq/seq_dummy.c | 24 +- + sound/core/sound_kunit.c | 10 +- + sound/drivers/aloop.c | 9 +- + sound/firewire/amdtp-stream.c | 10 +- + sound/hda/hdac_controller.c | 127 +- + sound/isa/sb/emu8000_patch.c | 13 - + sound/pci/emu10k1/emu10k1_callback.c | 13 +- + sound/pci/emu10k1/emu10k1_main.c | 75 +- + sound/pci/emu10k1/emu10k1_patch.c | 207 +-- + sound/pci/emu10k1/io.c | 53 + + sound/pci/emu10k1/memory.c | 55 +- + sound/pci/hda/Kconfig | 2 + + sound/pci/hda/cs35l41_hda.c | 349 +++-- + sound/pci/hda/cs35l41_hda.h | 6 + + sound/pci/hda/cs35l41_hda_property.c | 12 +- + sound/pci/hda/hda_controller.c | 7 +- + sound/pci/hda/hda_controller.h | 1 + + sound/pci/hda/hda_intel.c | 5 +- + sound/pci/hda/patch_realtek.c | 6 + + sound/soc/sof/intel/hda-bus.c | 5 + + sound/synth/emux/emux.c | 6 +- + sound/synth/emux/emux_hwdep.c | 3 +- + sound/synth/emux/emux_oss.c | 3 +- + sound/synth/emux/emux_proc.c | 1 + + sound/synth/emux/emux_seq.c | 6 +- + sound/synth/emux/soundfont.c | 73 +- + sound/usb/mixer_quirks.c | 2 + + sound/usb/mixer_scarlett2.c | 2757 +++++++++++++++++++++++++++------- + 35 files changed, 2967 insertions(+), 936 deletions(-) +Merging ieee1394/for-next (b66fde5b9bc2 firewire: core: add tracepoints events for asynchronous outbound response) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + drivers/firewire/.kunitconfig | 1 + + drivers/firewire/Kconfig | 16 + + drivers/firewire/Makefile | 5 +- + drivers/firewire/core-card.c | 10 + + drivers/firewire/core-trace.c | 5 + + drivers/firewire/core-transaction.c | 252 ++++++------ + drivers/firewire/core.h | 25 +- + drivers/firewire/ohci.c | 113 +++--- + drivers/firewire/packet-header-definitions.h | 234 +++++++++++ + drivers/firewire/packet-serdes-test.c | 582 +++++++++++++++++++++++++++ + include/linux/firewire.h | 3 +- + include/trace/events/firewire.h | 211 ++++++++++ + 12 files changed, 1276 insertions(+), 181 deletions(-) + create mode 100644 drivers/firewire/core-trace.c + create mode 100644 drivers/firewire/packet-header-definitions.h + create mode 100644 drivers/firewire/packet-serdes-test.c + create mode 100644 include/trace/events/firewire.h +Merging sound-asoc/for-next (8b56e4bd1abe Merge remote-tracking branch 'asoc/for-6.10' 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 MAINTAINERS +Auto-merging sound/soc/intel/avs/core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/davinci-mcbsp.txt | 50 - + .../devicetree/bindings/sound/davinci-mcbsp.yaml | 113 + + .../devicetree/bindings/sound/fsl,audmix.txt | 50 - + .../devicetree/bindings/sound/fsl,audmix.yaml | 83 + + .../devicetree/bindings/sound/fsl,esai.txt | 68 - + .../devicetree/bindings/sound/fsl,esai.yaml | 118 ++ + .../devicetree/bindings/sound/fsl,imx-asrc.yaml | 14 + + .../bindings/sound/fsl,imx-audio-spdif.yaml | 66 + + .../devicetree/bindings/sound/fsl,sai.yaml | 6 +- + .../devicetree/bindings/sound/fsl,spdif.yaml | 35 +- + .../devicetree/bindings/sound/fsl,ssi.txt | 87 - + .../devicetree/bindings/sound/fsl,ssi.yaml | 194 ++ + .../devicetree/bindings/sound/fsl-asoc-card.txt | 117 -- + .../devicetree/bindings/sound/fsl-asoc-card.yaml | 197 ++ + .../devicetree/bindings/sound/imx-audio-spdif.txt | 36 - + .../bindings/sound/mediatek,mt2701-wm8960.yaml | 54 + + .../devicetree/bindings/sound/mt2701-wm8960.txt | 24 - + .../sound/mt8186-mt6366-da7219-max98357.yaml | 131 +- + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 120 +- + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 139 +- + .../devicetree/bindings/sound/mt8195-mt6359.yaml | 134 ++ + .../devicetree/bindings/sound/nuvoton,nau8325.yaml | 80 + + .../devicetree/bindings/sound/nuvoton,nau8821.yaml | 7 + + .../bindings/sound/nvidia,tegra20-ac97.txt | 36 - + .../bindings/sound/nvidia,tegra20-ac97.yaml | 82 + + .../bindings/sound/nvidia,tegra20-das.txt | 12 - + .../bindings/sound/nvidia,tegra20-das.yaml | 36 + + .../devicetree/bindings/sound/qcom,sm8250.yaml | 2 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 5 +- + .../bindings/sound/rockchip,rk3308-codec.yaml | 98 + + .../devicetree/bindings/sound/ti,pcm1681.txt | 15 - + .../devicetree/bindings/sound/ti,pcm1681.yaml | 43 + + .../devicetree/bindings/sound/ti,pcm6240.yaml | 177 ++ + .../devicetree/bindings/sound/wlf,wm8776.yaml | 41 + + .../devicetree/bindings/sound/wlf,wm8974.txt | 15 - + .../devicetree/bindings/sound/wlf,wm8974.yaml | 41 + + Documentation/devicetree/bindings/sound/wm8776.txt | 18 - + MAINTAINERS | 13 + + drivers/firmware/cirrus/cs_dsp.c | 54 + + include/linux/firmware/cirrus/cs_dsp.h | 4 + + include/linux/platform_data/davinci_asp.h | 15 - + include/sound/control.h | 23 + + include/sound/dmaengine_pcm.h | 2 + + .../sound/soc-acpi-intel-ssp-common.h | 29 +- + include/sound/soc-acpi.h | 12 + + include/sound/soc-jack.h | 2 - + include/sound/soc.h | 44 +- + include/trace/events/asoc.h | 2 + + include/uapi/sound/asoc.h | 56 - + include/uapi/sound/skl-tplg-interface.h | 74 - + sound/pci/hda/hda_cs_dsp_ctl.c | 22 +- + sound/soc/Kconfig | 8 + + sound/soc/Makefile | 4 + + sound/soc/amd/Kconfig | 21 +- + sound/soc/amd/acp-da7219-max98357a.c | 2 +- + sound/soc/codecs/Kconfig | 25 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/cs35l41.c | 7 +- + sound/soc/codecs/cs35l56-shared.c | 1 + + sound/soc/codecs/cs35l56.c | 1 + + sound/soc/codecs/es8326.c | 41 +- + sound/soc/codecs/hdac_hda.c | 44 +- + sound/soc/codecs/max98373-sdw.c | 1 - + sound/soc/codecs/nau8325.c | 900 ++++++++ + sound/soc/codecs/nau8325.h | 391 ++++ + sound/soc/codecs/nau8821.c | 19 +- + sound/soc/codecs/nau8821.h | 1 + + sound/soc/codecs/nau8822.h | 1 - + sound/soc/codecs/pcm6240.c | 2217 ++++++++++++++++++++ + sound/soc/codecs/pcm6240.h | 252 +++ + sound/soc/codecs/rk3308_codec.c | 974 +++++++++ + sound/soc/codecs/rk3308_codec.h | 579 +++++ + sound/soc/codecs/rt1017-sdca-sdw.c | 1 - + sound/soc/codecs/rt1308-sdw.c | 1 - + sound/soc/codecs/rt1316-sdw.c | 1 - + sound/soc/codecs/rt1318-sdw.c | 1 - + sound/soc/codecs/rt5682-sdw.c | 1 - + sound/soc/codecs/rt700-sdw.c | 1 - + sound/soc/codecs/rt711-sdca-sdw.c | 1 - + sound/soc/codecs/rt711-sdw.c | 1 - + sound/soc/codecs/rt712-sdca-dmic.c | 1 - + sound/soc/codecs/rt712-sdca-sdw.c | 1 - + sound/soc/codecs/rt715-sdca-sdw.c | 1 - + sound/soc/codecs/rt715-sdca.c | 4 +- + sound/soc/codecs/rt715-sdw.c | 1 - + sound/soc/codecs/rt722-sdca-sdw.c | 1 - + sound/soc/codecs/sdw-mockup.c | 1 - + sound/soc/codecs/tas2780.c | 3 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 1 - + sound/soc/codecs/tlv320aic3x-spi.c | 1 - + sound/soc/codecs/wcd934x.c | 1 - + sound/soc/codecs/wm_adsp.c | 33 +- + sound/soc/fsl/fsl-asoc-card.c | 8 + + sound/soc/fsl/fsl_rpmsg.c | 43 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/fsl/imx-audio-rpmsg.c | 21 +- + sound/soc/fsl/imx-es8328.c | 17 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 11 +- + sound/soc/fsl/imx-rpmsg.c | 28 +- + sound/soc/generic/simple-card-utils.c | 2 - + sound/soc/intel/Kconfig | 1 + + sound/soc/intel/avs/apl.c | 20 +- + sound/soc/intel/avs/avs.h | 12 +- + sound/soc/intel/avs/board_selection.c | 7 +- + sound/soc/intel/avs/boards/es8336.c | 2 +- + sound/soc/intel/avs/boards/hdaudio.c | 6 +- + sound/soc/intel/avs/boards/i2s_test.c | 79 - + sound/soc/intel/avs/boards/nau8825.c | 2 +- + sound/soc/intel/avs/boards/rt274.c | 2 +- + sound/soc/intel/avs/boards/rt286.c | 2 +- + sound/soc/intel/avs/boards/rt298.c | 2 +- + sound/soc/intel/avs/boards/rt5663.c | 2 +- + sound/soc/intel/avs/boards/rt5682.c | 2 +- + sound/soc/intel/avs/boards/ssm4567.c | 5 +- + sound/soc/intel/avs/cldma.c | 44 +- + sound/soc/intel/avs/cldma.h | 1 + + sound/soc/intel/avs/cnl.c | 81 +- + sound/soc/intel/avs/core.c | 97 +- + sound/soc/intel/avs/icl.c | 15 +- + sound/soc/intel/avs/ipc.c | 48 - + sound/soc/intel/avs/loader.c | 6 +- + sound/soc/intel/avs/messages.h | 47 +- + sound/soc/intel/avs/path.c | 45 +- + sound/soc/intel/avs/pcm.c | 34 +- + sound/soc/intel/avs/probes.c | 14 +- + sound/soc/intel/avs/skl.c | 73 +- + sound/soc/intel/avs/tgl.c | 3 +- + sound/soc/intel/avs/utils.c | 8 +- + sound/soc/intel/boards/Kconfig | 27 +- + sound/soc/intel/boards/Makefile | 9 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 1 + + sound/soc/intel/boards/bxt_rt298.c | 1 + + sound/soc/intel/boards/cml_rt1011_rt5682.c | 609 ------ + sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 + + sound/soc/intel/boards/kbl_da7219_max98357a.c | 1 + + sound/soc/intel/boards/kbl_da7219_max98927.c | 4 + + sound/soc/intel/boards/kbl_rt5660.c | 1 + + sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 + + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 1 + + sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 + + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 1 + + sound/soc/intel/boards/skl_rt286.c | 1 + + sound/soc/intel/boards/sof_board_helpers.c | 161 +- + sound/soc/intel/boards/sof_board_helpers.h | 106 +- + sound/soc/intel/boards/sof_cirrus_common.h | 2 +- + sound/soc/intel/boards/sof_cs42l42.c | 89 +- + sound/soc/intel/boards/sof_da7219.c | 418 ++-- + sound/soc/intel/boards/sof_maxim_common.h | 2 +- + sound/soc/intel/boards/sof_nau8825.c | 95 +- + sound/soc/intel/boards/sof_nuvoton_common.h | 2 +- + sound/soc/intel/boards/sof_realtek_common.c | 178 +- + sound/soc/intel/boards/sof_realtek_common.h | 6 +- + sound/soc/intel/boards/sof_rt5682.c | 253 +-- + sound/soc/intel/boards/sof_sdw.c | 1209 +++++------ + sound/soc/intel/boards/sof_sdw_common.h | 43 +- + sound/soc/intel/boards/sof_sdw_cs42l42.c | 1 - + sound/soc/intel/boards/sof_sdw_cs42l43.c | 50 + + sound/soc/intel/boards/sof_sdw_cs_amp.c | 1 - + sound/soc/intel/boards/sof_sdw_maxim.c | 1 - + sound/soc/intel/boards/sof_sdw_rt5682.c | 1 - + sound/soc/intel/boards/sof_sdw_rt700.c | 1 - + sound/soc/intel/boards/sof_sdw_rt711.c | 2 - + sound/soc/intel/boards/sof_sdw_rt712_sdca.c | 25 - + sound/soc/intel/boards/sof_sdw_rt715.c | 26 - + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 26 - + sound/soc/intel/boards/sof_sdw_rt722_sdca.c | 38 +- + sound/soc/intel/boards/sof_sdw_rt_amp.c | 1 - + sound/soc/intel/boards/sof_sdw_rt_dmic.c | 54 + + .../soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 4 +- + sound/soc/intel/boards/sof_ssp_amp.c | 264 +-- + sound/soc/intel/boards/sof_ssp_common.c | 122 -- + sound/soc/intel/common/Makefile | 2 + + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 150 +- + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 24 + + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 8 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 4 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 123 +- + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 97 +- + sound/soc/intel/common/soc-acpi-intel-ssp-common.c | 159 ++ + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 85 +- + sound/soc/intel/skylake/skl-topology.c | 169 -- + sound/soc/kirkwood/kirkwood-dma.c | 3 + + sound/soc/loongson/loongson_i2s_pci.c | 1 - + sound/soc/mediatek/Kconfig | 24 +- + sound/soc/mediatek/common/Makefile | 2 + + .../soc/mediatek/common/mtk-afe-platform-driver.c | 18 + + sound/soc/mediatek/common/mtk-dai-adda-common.c | 70 + + sound/soc/mediatek/common/mtk-dai-adda-common.h | 45 + + sound/soc/mediatek/common/mtk-dsp-sof-common.c | 15 +- + sound/soc/mediatek/common/mtk-dsp-sof-common.h | 1 - + sound/soc/mediatek/common/mtk-soc-card.h | 7 +- + sound/soc/mediatek/common/mtk-soundcard-driver.c | 205 +- + sound/soc/mediatek/common/mtk-soundcard-driver.h | 42 + + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 14 +- + sound/soc/mediatek/mt6797/mt6797-dai-adda.c | 85 +- + sound/soc/mediatek/mt7986/mt7986-afe-pcm.c | 14 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 14 +- + sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 90 +- + sound/soc/mediatek/mt8186/Makefile | 3 +- + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 92 +- + .../mt8186/mt8186-mt6366-da7219-max98357.c | 1189 ----------- + ...186-mt6366-rt1019-rt5682s.c => mt8186-mt6366.c} | 584 +++--- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 21 +- + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 89 +- + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 203 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 114 +- + sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 90 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 301 ++- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 21 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 90 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 491 ++--- + sound/soc/qcom/sc8280xp.c | 2 + + sound/soc/samsung/i2s.c | 1 - + sound/soc/sh/rcar/cmd.c | 6 +- + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/sh/rcar/ctu.c | 6 +- + sound/soc/sh/rcar/dma.c | 6 +- + sound/soc/sh/rcar/dvc.c | 6 +- + sound/soc/sh/rcar/gen.c | 515 ++--- + sound/soc/sh/rcar/mix.c | 6 +- + sound/soc/sh/rcar/rsnd.h | 22 +- + sound/soc/sh/rcar/src.c | 12 +- + sound/soc/sh/rcar/ssi.c | 2 +- + sound/soc/sh/rcar/ssiu.c | 2 +- + sound/soc/soc-card-test.c | 186 ++ + sound/soc/soc-card.c | 21 +- + sound/soc/soc-core.c | 8 +- + sound/soc/soc-dai.c | 2 +- + sound/soc/soc-dapm.c | 54 +- + sound/soc/soc-generic-dmaengine-pcm.c | 3 + + sound/soc/soc-jack.c | 23 +- + sound/soc/soc-pcm.c | 9 +- + sound/soc/soc-topology.c | 252 +-- + sound/soc/sof/amd/acp-loader.c | 2 + + sound/soc/sof/debug.c | 19 - + sound/soc/sof/imx/imx-common.c | 24 - + sound/soc/sof/imx/imx-common.h | 9 - + sound/soc/sof/imx/imx8.c | 41 +- + sound/soc/sof/imx/imx8m.c | 40 +- + sound/soc/sof/imx/imx8ulp.c | 42 +- + sound/soc/sof/intel/hda-codec.c | 15 +- + sound/soc/sof/intel/hda-ctrl.c | 9 +- + sound/soc/sof/intel/hda-dai-ops.c | 41 +- + sound/soc/sof/intel/hda-dai.c | 124 +- + sound/soc/sof/intel/hda-loader.c | 87 +- + sound/soc/sof/intel/hda-stream.c | 24 +- + sound/soc/sof/intel/hda.c | 184 +- + sound/soc/sof/intel/hda.h | 26 +- + sound/soc/sof/intel/lnl.c | 29 +- + sound/soc/sof/intel/lnl.h | 15 + + sound/soc/sof/intel/mtl.c | 68 +- + sound/soc/sof/intel/mtl.h | 48 +- + sound/soc/sof/intel/tgl.c | 15 +- + sound/soc/sof/ipc4-loader.c | 8 + + sound/soc/sof/ipc4-priv.h | 2 +- + sound/soc/sof/ipc4-topology.c | 71 +- + sound/soc/sof/ipc4-topology.h | 3 +- + sound/soc/sof/pcm.c | 58 +- + sound/soc/sof/sof-audio.c | 29 +- + sound/soc/sof/sof-audio.h | 2 + + sound/soc/sof/sof-client-ipc-flood-test.c | 17 +- + sound/soc/sunxi/sun4i-i2s.c | 33 +- + sound/soc/sunxi/sun50i-codec-analog.c | 73 +- + sound/soc/sunxi/sun8i-codec.c | 346 ++- + sound/soc/ti/davinci-i2s.c | 278 ++- + tools/sound/dapm-graph | 303 +++ + 266 files changed, 13283 insertions(+), 7792 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.txt + create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,esai.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,esai.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,imx-audio-spdif.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,ssi.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,ssi.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/imx-audio-spdif.txt + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt2701-wm8960.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mt2701-wm8960.txt + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8325.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-das.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-das.yaml + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3308-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm6240.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8776.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8974.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8974.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8776.txt + rename sound/soc/intel/boards/sof_ssp_common.h => include/sound/soc-acpi-intel-ssp-common.h (66%) + create mode 100644 sound/soc/codecs/nau8325.c + create mode 100644 sound/soc/codecs/nau8325.h + create mode 100644 sound/soc/codecs/pcm6240.c + create mode 100644 sound/soc/codecs/pcm6240.h + create mode 100644 sound/soc/codecs/rk3308_codec.c + create mode 100644 sound/soc/codecs/rk3308_codec.h + delete mode 100644 sound/soc/intel/boards/cml_rt1011_rt5682.c + delete mode 100644 sound/soc/intel/boards/sof_sdw_rt715.c + delete mode 100644 sound/soc/intel/boards/sof_sdw_rt715_sdca.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt_dmic.c + delete mode 100644 sound/soc/intel/boards/sof_ssp_common.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-ssp-common.c + create mode 100644 sound/soc/mediatek/common/mtk-dai-adda-common.c + create mode 100644 sound/soc/mediatek/common/mtk-dai-adda-common.h + delete mode 100644 sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c + rename sound/soc/mediatek/mt8186/{mt8186-mt6366-rt1019-rt5682s.c => mt8186-mt6366.c} (72%) + create mode 100644 sound/soc/soc-card-test.c + create mode 100644 sound/soc/sof/intel/lnl.h + create mode 100755 tools/sound/dapm-graph +Merging modules/modules-next (3c2c250cb3a5 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of) +$ 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 arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/mips/include/asm/pgtable-64.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/mm/mem.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/probes/kprobes.c +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/net/bpf_jit_core.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/mm/init.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/module/main.c +CONFLICT (content): Merge conflict in kernel/module/main.c +Auto-merging mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/mm_init.c +Resolved 'arch/powerpc/mm/mem.c' using previous resolution. +Resolved 'kernel/module/main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dc96de676040] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 10 ++- + arch/arm/kernel/module.c | 34 --------- + arch/arm/mm/init.c | 45 +++++++++++ + arch/arm64/Kconfig | 1 + + arch/arm64/kernel/module.c | 126 ------------------------------ + arch/arm64/kernel/probes/kprobes.c | 7 -- + arch/arm64/mm/init.c | 140 ++++++++++++++++++++++++++++++++++ + arch/arm64/net/bpf_jit_comp.c | 11 --- + arch/loongarch/kernel/module.c | 6 -- + arch/loongarch/mm/init.c | 21 +++++ + arch/mips/include/asm/pgtable-64.h | 4 +- + arch/mips/kernel/module.c | 10 --- + arch/mips/mm/fault.c | 4 +- + arch/mips/mm/init.c | 23 ++++++ + arch/nios2/include/asm/pgtable.h | 5 +- + arch/nios2/kernel/module.c | 20 ----- + arch/nios2/mm/init.c | 21 +++++ + arch/parisc/kernel/module.c | 12 --- + arch/parisc/mm/init.c | 23 +++++- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/kasan.h | 2 +- + arch/powerpc/kernel/head_8xx.S | 4 +- + arch/powerpc/kernel/head_book3s_32.S | 6 +- + arch/powerpc/kernel/kprobes.c | 22 +----- + arch/powerpc/kernel/module.c | 38 --------- + arch/powerpc/lib/code-patching.c | 2 +- + arch/powerpc/mm/book3s32/mmu.c | 2 +- + arch/powerpc/mm/mem.c | 64 ++++++++++++++++ + arch/riscv/include/asm/pgtable.h | 3 + + arch/riscv/kernel/module.c | 12 --- + arch/riscv/kernel/probes/kprobes.c | 10 --- + arch/riscv/mm/init.c | 35 +++++++++ + arch/riscv/net/bpf_jit_core.c | 13 ---- + arch/s390/kernel/ftrace.c | 4 +- + arch/s390/kernel/kprobes.c | 4 +- + arch/s390/kernel/module.c | 42 +--------- + arch/s390/mm/init.c | 30 ++++++++ + arch/sparc/include/asm/pgtable_32.h | 2 + + arch/sparc/kernel/module.c | 30 -------- + arch/sparc/mm/Makefile | 2 + + arch/sparc/mm/execmem.c | 21 +++++ + arch/sparc/net/bpf_jit_comp_32.c | 8 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/ftrace.c | 16 +--- + arch/x86/kernel/kprobes/core.c | 4 +- + arch/x86/kernel/module.c | 51 ------------- + arch/x86/mm/init.c | 29 +++++++ + include/linux/execmem.h | 132 ++++++++++++++++++++++++++++++++ + include/linux/module.h | 9 +++ + include/linux/moduleloader.h | 15 ---- + kernel/bpf/Kconfig | 2 +- + kernel/bpf/core.c | 6 +- + kernel/kprobes.c | 63 +++++++++------ + kernel/module/Kconfig | 3 +- + kernel/module/kallsyms.c | 2 +- + kernel/module/main.c | 108 ++++++++++++-------------- + kernel/trace/trace_kprobe.c | 20 ++++- + mm/Kconfig | 3 + + mm/Makefile | 1 + + mm/execmem.c | 144 +++++++++++++++++++++++++++++++++++ + mm/mm_init.c | 2 + + scripts/Makefile.modpost | 2 +- + 62 files changed, 908 insertions(+), 586 deletions(-) + create mode 100644 arch/sparc/mm/execmem.c + create mode 100644 include/linux/execmem.h + create mode 100644 mm/execmem.c +$ git am -3 ../patches/fixup-for-boot-failure-after-merge-of-the-modules-tree.patch +Applying: linux-next: boot failure after merge of the modules tree +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 0799cf0f9cd7] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git + Date: Tue Apr 30 13:02:38 2024 +1000 +Merging input/next (9e0631695eac input: pm8xxx-vibrator: add new SPMI vibrator support) +$ 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/sur40.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/qcom,pm8xxx-vib.yaml | 16 +++- + drivers/input/joystick/adafruit-seesaw.c | 21 ++++- + drivers/input/keyboard/stmpe-keypad.c | 1 - + drivers/input/misc/ims-pcu.c | 4 +- + drivers/input/misc/pm8xxx-vibrator.c | 92 ++++++++++++++++------ + drivers/input/serio/ioc3kbd.c | 7 ++ + drivers/input/touchscreen/sur40.c | 2 +- + 7 files changed, 108 insertions(+), 35 deletions(-) +Merging block/for-next (518f377c90e5 Merge branch 'for-6.10/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging block/blk-zoned.c +Auto-merging block/fops.c +Auto-merging block/genhd.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/sd.c +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/blkdev.h +Auto-merging io_uring/io_uring.c +CONFLICT (content): Merge conflict in io_uring/io_uring.c +Auto-merging io_uring/rw.c +CONFLICT (content): Merge conflict in io_uring/rw.c +Auto-merging mm/nommu.c +Resolved 'io_uring/io_uring.c' using previous resolution. +Resolved 'io_uring/rw.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 30399e037e80] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + block/Kconfig | 5 - + block/Makefile | 1 - + block/bio.c | 2 + + block/blk-cgroup-rwstat.c | 18 +- + block/blk-cgroup.c | 3 +- + block/blk-core.c | 11 +- + block/blk-flush.c | 1 + + block/blk-merge.c | 23 +- + block/blk-mq-debugfs-zoned.c | 22 - + block/blk-mq-debugfs.c | 3 +- + block/blk-mq-debugfs.h | 6 +- + block/blk-mq.c | 182 ++--- + block/blk-mq.h | 31 - + block/blk-settings.c | 46 +- + block/blk-sysfs.c | 2 +- + block/blk-throttle.c | 51 +- + block/blk-zoned.c | 1359 ++++++++++++++++++++++++++++++++++--- + block/blk.h | 84 ++- + block/elevator.c | 46 +- + block/elevator.h | 1 - + block/fops.c | 29 +- + block/genhd.c | 3 +- + block/mq-deadline.c | 204 +----- + drivers/block/brd.c | 40 +- + drivers/block/null_blk/main.c | 42 +- + drivers/block/null_blk/null_blk.h | 2 + + drivers/block/null_blk/zoned.c | 358 +++++----- + drivers/block/ublk_drv.c | 5 +- + drivers/block/virtio_blk.c | 2 +- + drivers/md/dm-bio-prison-v2.c | 3 +- + drivers/md/dm-cache-target.c | 12 +- + drivers/md/dm-clone-target.c | 14 +- + drivers/md/dm-core.h | 2 +- + drivers/md/dm-era-target.c | 3 +- + drivers/md/dm-mpath.c | 3 +- + drivers/md/dm-thin.c | 12 +- + drivers/md/dm-vdo/data-vio.c | 3 +- + drivers/md/dm-vdo/flush.c | 3 +- + drivers/md/dm-zone.c | 478 ++----------- + drivers/md/dm.c | 72 +- + drivers/md/dm.h | 2 - + drivers/md/md.c | 14 +- + drivers/md/md.h | 5 +- + drivers/md/raid5.c | 15 +- + drivers/nvme/host/core.c | 2 +- + drivers/nvme/host/ioctl.c | 15 +- + drivers/nvme/target/zns.c | 10 +- + drivers/scsi/scsi_lib.c | 1 - + drivers/scsi/sd.c | 8 - + drivers/scsi/sd.h | 19 - + drivers/scsi/sd_zbc.c | 335 +-------- + fs/btrfs/raid56.c | 3 +- + include/linux/bio.h | 7 + + include/linux/blk-mq.h | 85 +-- + include/linux/blk_types.h | 30 +- + include/linux/blkdev.h | 105 ++- + include/linux/io_uring.h | 6 - + include/linux/io_uring/cmd.h | 24 + + include/linux/io_uring/net.h | 18 + + include/linux/io_uring_types.h | 19 +- + include/uapi/linux/io_uring.h | 28 +- + io_uring/Makefile | 15 +- + io_uring/alloc_cache.h | 59 +- + io_uring/cancel.c | 4 +- + io_uring/fdinfo.c | 4 +- + io_uring/futex.c | 30 +- + io_uring/futex.h | 5 +- + io_uring/io-wq.c | 20 +- + io_uring/io_uring.c | 667 ++++-------------- + io_uring/io_uring.h | 33 +- + io_uring/kbuf.c | 320 +++++---- + io_uring/kbuf.h | 64 +- + io_uring/memmap.c | 336 +++++++++ + io_uring/memmap.h | 25 + + io_uring/msg_ring.c | 2 +- + io_uring/net.c | 835 +++++++++++++---------- + io_uring/net.h | 29 +- + io_uring/notif.c | 115 ++-- + io_uring/notif.h | 13 +- + io_uring/opdef.c | 65 +- + io_uring/opdef.h | 9 +- + io_uring/poll.c | 15 +- + io_uring/poll.h | 9 +- + io_uring/refs.h | 7 + + io_uring/register.c | 3 +- + io_uring/rsrc.c | 47 +- + io_uring/rsrc.h | 13 +- + io_uring/rw.c | 593 ++++++++-------- + io_uring/rw.h | 25 +- + io_uring/sqpoll.c | 8 + + io_uring/timeout.c | 9 +- + io_uring/uring_cmd.c | 122 +++- + io_uring/uring_cmd.h | 8 +- + io_uring/waitid.c | 2 +- + lib/sbitmap.c | 8 +- + mm/nommu.c | 7 + + net/socket.c | 2 +- + 97 files changed, 3937 insertions(+), 3529 deletions(-) + delete mode 100644 block/blk-mq-debugfs-zoned.c + create mode 100644 include/linux/io_uring/net.h + create mode 100644 io_uring/memmap.c + create mode 100644 io_uring/memmap.h +$ git am -3 ../patches/0001-fix-up-for-mm-switch-mm-get_unmapped_area-to-a-flag.patch +Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag" +$ git reset HEAD^ +Unstaged changes after reset: +M io_uring/memmap.c +$ git add -A . +$ git commit -v -a --amend +[master 7fb2db2c286b] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git + Date: Tue Apr 30 13:02:50 2024 +1000 +Merging device-mapper/for-next (83637d9017b2 dm-crypt: don't set WQ_CPU_INTENSIVE for WQ_UNBOUND crypt_queue) +$ 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 +Merge made by the 'ort' strategy. + .../admin-guide/device-mapper/dm-crypt.rst | 5 ++ + drivers/md/dm-crypt.c | 73 +++++++++++++++------- + drivers/md/dm-table.c | 27 ++++---- + 3 files changed, 66 insertions(+), 39 deletions(-) +Merging libata/for-next (9e6938e14ea5 ata: libata-core: Remove ata_exec_internal_sg()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Auto-merging drivers/ata/libata-core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/ahci-da850.txt | 18 ---- + .../devicetree/bindings/ata/fsl,imx-pata.yaml | 42 ++++++++ + Documentation/devicetree/bindings/ata/imx-pata.txt | 16 --- + .../devicetree/bindings/ata/ti,da850-ahci.yaml | 39 ++++++++ + drivers/ata/Kconfig | 28 +++--- + drivers/ata/libata-core.c | 108 ++++++--------------- + drivers/ata/libata-sff.c | 4 + + drivers/ata/libata.h | 8 +- + 8 files changed, 135 insertions(+), 128 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/ahci-da850.txt + create mode 100644 Documentation/devicetree/bindings/ata/fsl,imx-pata.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/imx-pata.txt + create mode 100644 Documentation/devicetree/bindings/ata/ti,da850-ahci.yaml +Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant) +$ 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 (e38063b94324 mmc: atmel-mci: Switch to use dev_err_probe()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/ath/ath10k/sdio.c +Auto-merging drivers/net/wireless/marvell/mwifiex/sdio.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 + + MAINTAINERS | 2 +- + drivers/bluetooth/btmrvl_sdio.c | 1 - + drivers/bluetooth/btmtksdio.c | 1 - + drivers/memstick/host/rtsx_pci_ms.c | 9 +- + drivers/memstick/host/rtsx_usb_ms.c | 6 +- + drivers/mmc/core/block.c | 8 +- + drivers/mmc/core/debugfs.c | 7 +- + drivers/mmc/core/host.c | 1 - + drivers/mmc/core/sdio_bus.c | 9 +- + drivers/mmc/core/slot-gpio.c | 25 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/atmel-mci.c | 309 +++++++++------------ + drivers/mmc/host/cqhci-core.c | 11 +- + drivers/mmc/host/cqhci.h | 4 + + drivers/mmc/host/davinci_mmc.c | 4 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 1 - + drivers/mmc/host/dw_mmc-hi3798mv200.c | 1 - + drivers/mmc/host/mtk-sd.c | 1 - + drivers/mmc/host/sdhci-acpi.c | 61 +++- + drivers/mmc/host/sdhci-esdhc-mcf.c | 2 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 305 +++++++++++++++++++- + drivers/mmc/host/sdhci-omap.c | 2 +- + drivers/mmc/host/sdhci-pci-gli.c | 46 ++- + drivers/mmc/host/sdhci-s3c.c | 35 +-- + drivers/mmc/host/sdhci-sprd.c | 3 +- + drivers/mmc/host/sdhci.c | 10 +- + drivers/mmc/host/sdhci.h | 3 +- + drivers/mmc/host/sdhci_am654.c | 182 +++++++++--- + drivers/net/wireless/ath/ath10k/sdio.c | 21 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 - + drivers/net/wireless/marvell/mwifiex/sdio.c | 1 - + drivers/net/wireless/silabs/wfx/bus_sdio.c | 1 - + include/linux/mmc/sdio_func.h | 5 +- + include/linux/mmc/slot-gpio.h | 6 +- + 35 files changed, 746 insertions(+), 342 deletions(-) +Merging mfd/for-mfd-next (0398a09c7b13 mfd: bd71828: Remove commented code lines) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/mfd/intel-lpss-pci.c +CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c +Resolved 'drivers/mfd/intel-lpss-pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fce029ef1f68] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git +$ git diff -M --stat --summary HEAD^.. + .../arm/altera/socfpga-sdram-controller.txt | 12 -- + Documentation/devicetree/bindings/arm/apm/scu.txt | 17 --- + .../bindings/arm/marvell/armada-37xx.txt | 32 ----- + .../bindings/input/twl4030-pwrbutton.txt | 21 ---- + .../devicetree/bindings/mfd/brcm,iproc-cdru.txt | 16 --- + .../devicetree/bindings/mfd/brcm,iproc-mhb.txt | 18 --- + .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 9 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 15 +++ + Documentation/devicetree/bindings/mfd/ti,twl.yaml | 72 ++++++++++- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 2 + + Documentation/devicetree/bindings/rtc/twl-rtc.txt | 11 -- + .../devicetree/bindings/watchdog/twl4030-wdt.txt | 10 -- + MAINTAINERS | 2 +- + arch/sh/boards/board-sh7757lcr.c | 2 +- + arch/sh/boards/mach-ap325rxa/setup.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 2 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 3 +- + drivers/mfd/Kconfig | 12 +- + drivers/mfd/axp20x-i2c.c | 2 + + drivers/mfd/axp20x-rsb.c | 1 + + drivers/mfd/axp20x.c | 90 ++++++++++++++ + drivers/mfd/intel-lpss-pci.c | 2 +- + drivers/mfd/intel-m10-bmc-pmci.c | 1 + + drivers/mfd/intel-m10-bmc-spi.c | 1 + + drivers/mfd/kempld-core.c | 105 +++++----------- + drivers/mfd/ocelot-spi.c | 5 +- + drivers/mfd/rohm-bd71828.c | 36 +++++- + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 5 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 5 +- + drivers/mmc/host/tmio_mmc_core.c | 3 +- + drivers/mmc/host/uniphier-sd.c | 2 +- + drivers/regulator/axp20x-regulator.c | 94 ++++++++++++++- + include/linux/mfd/axp20x.h | 98 ++++++++++++++- + include/linux/mfd/intel-m10-bmc.h | 1 + + include/linux/mfd/rohm-bd71828.h | 5 +- + include/linux/mfd/tmio.h | 133 --------------------- + include/linux/platform_data/tmio.h | 64 ++++++++++ + 41 files changed, 536 insertions(+), 383 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-sdram-controller.txt + delete mode 100644 Documentation/devicetree/bindings/arm/apm/scu.txt + delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt + delete mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/brcm,iproc-cdru.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/brcm,iproc-mhb.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/twl-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt + delete mode 100644 include/linux/mfd/tmio.h + create mode 100644 include/linux/platform_data/tmio.h +Merging backlight/for-backlight-next (df012cf5c42e backlight: otm3225a: Drop driver owner assignment) +$ 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 +Auto-merging drivers/hid/hid-picolcd_core.c +Auto-merging drivers/hid/hid-picolcd_fb.c +Auto-merging drivers/video/fbdev/sh_mobile_lcdcfb.c +Auto-merging include/linux/fb.h +Merge made by the 'ort' strategy. + drivers/auxdisplay/ht16k33.c | 15 +- + drivers/hid/hid-picolcd_backlight.c | 7 - + drivers/hid/hid-picolcd_core.c | 14 +- + drivers/hid/hid-picolcd_fb.c | 6 + + drivers/staging/fbtft/fb_ssd1351.c | 4 +- + drivers/staging/fbtft/fbtft-core.c | 5 +- + drivers/video/backlight/aat2870_bl.c | 7 - + drivers/video/backlight/backlight.c | 39 +++--- + drivers/video/backlight/bd6107.c | 12 +- + drivers/video/backlight/gpio_backlight.c | 12 +- + drivers/video/backlight/lcd.c | 23 ++-- + drivers/video/backlight/lp8788_bl.c | 151 ++------------------- + drivers/video/backlight/lv5207lp.c | 12 +- + drivers/video/backlight/mp3309c.c | 4 +- + drivers/video/backlight/omap1_bl.c | 47 +++---- + drivers/video/backlight/otm3225a.c | 1 - + drivers/video/backlight/pwm_bl.c | 12 -- + drivers/video/fbdev/atmel_lcdfb.c | 1 - + drivers/video/fbdev/core/fb_backlight.c | 6 + + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 7 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 10 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 7 - + drivers/video/fbdev/ssd1307fb.c | 31 ++--- + include/linux/backlight.h | 41 ++---- + include/linux/fb.h | 9 ++ + include/linux/mfd/lp8788.h | 36 ----- + include/linux/platform_data/omap1_bl.h | 1 - + include/linux/pwm_backlight.h | 1 - + 28 files changed, 136 insertions(+), 385 deletions(-) +Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop) +$ 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 +Merge made by the 'ort' strategy. + drivers/power/supply/bq27xxx_battery.c | 116 ++++++++++++++----------- + drivers/power/supply/cros_peripheral_charger.c | 11 ++- + drivers/power/supply/cros_usbpd-charger.c | 11 ++- + drivers/power/supply/power_supply_sysfs.c | 20 +---- + drivers/power/supply/test_power.c | 36 ++++++++ + include/linux/power/bq27xxx_battery.h | 8 -- + 6 files changed, 120 insertions(+), 82 deletions(-) +Merging regulator/for-next (84c1815e46bd Merge remote-tracking branch 'regulator/for-6.10' 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 +Merge made by the 'ort' strategy. + .../bindings/regulator/nxp,pca9450-regulator.yaml | 1 + + .../regulator/qcom,usb-vbus-regulator.yaml | 1 + + drivers/regulator/da9121-regulator.c | 4 +- + drivers/regulator/da9211-regulator.c | 2 +- + drivers/regulator/isl9305.c | 2 +- + drivers/regulator/max8973-regulator.c | 2 +- + drivers/regulator/mt6311-regulator.c | 2 +- + drivers/regulator/pca9450-regulator.c | 196 ++++++++++++++++++++- + drivers/regulator/pf8x00-regulator.c | 2 +- + drivers/regulator/pfuze100-regulator.c | 2 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 2 +- + drivers/regulator/rtmv20-regulator.c | 2 +- + drivers/regulator/rtq6752-regulator.c | 2 +- + drivers/regulator/tps51632-regulator.c | 2 +- + drivers/regulator/tps62360-regulator.c | 2 +- + include/linux/regulator/pca9450.h | 1 + + 16 files changed, 209 insertions(+), 16 deletions(-) +Merging security/next (74560bb3685b lsm: remove the now superfluous sentinel element from ctl_table array) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + security/apparmor/lsm.c | 1 - + security/keys/sysctl.c | 1 - + security/loadpin/loadpin.c | 1 - + security/yama/yama_lsm.c | 1 - + 4 files changed, 4 deletions(-) +Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile()) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (9fa8e7625008 ima: add crypto agility support for template-hash algorithm) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/overlayfs/copy_up.c | 2 +- + fs/overlayfs/super.c | 2 +- + include/linux/evm.h | 8 ++ + include/linux/fs.h | 2 +- + include/linux/integrity.h | 34 ++++++++ + include/linux/lsm_hook_defs.h | 3 +- + include/linux/security.h | 4 +- + security/integrity/evm/evm.h | 8 +- + security/integrity/evm/evm_crypto.c | 25 ++++-- + security/integrity/evm/evm_main.c | 92 +++++++++++++++----- + security/integrity/ima/ima.h | 12 ++- + security/integrity/ima/ima_api.c | 32 ++++--- + security/integrity/ima/ima_appraise.c | 4 +- + security/integrity/ima/ima_crypto.c | 7 +- + security/integrity/ima/ima_fs.c | 134 +++++++++++++++++++++++++++--- + security/integrity/ima/ima_iint.c | 2 +- + security/integrity/ima/ima_init.c | 6 +- + security/integrity/ima/ima_kexec.c | 1 + + security/integrity/ima/ima_main.c | 44 +++++++--- + security/integrity/ima/ima_template_lib.c | 27 ++++-- + security/integrity/integrity.h | 12 ++- + security/security.c | 5 +- + security/selinux/hooks.c | 2 +- + security/smack/smack_lsm.c | 2 +- + 24 files changed, 374 insertions(+), 96 deletions(-) +Merging selinux/next (d6fc1ee0b6c1 Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + security/selinux/hooks.c | 58 ++++++++++++++++----------------------- + security/selinux/selinuxfs.c | 30 ++++++++++---------- + security/selinux/ss/conditional.c | 3 ++ + security/selinux/ss/ebitmap.c | 50 +++++++++++++++++++++------------ + security/selinux/ss/ebitmap.h | 38 ++++++++++++------------- + security/selinux/ss/policydb.c | 24 +++++++++++----- + security/selinux/ss/symtab.c | 20 +++++++------- + security/selinux/xfrm.c | 7 ++--- + 8 files changed, 121 insertions(+), 109 deletions(-) +Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (3c6e94beeacd Documentation: tpm_tis) +$ 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 'ort' strategy. + Documentation/security/tpm/index.rst | 1 + + Documentation/security/tpm/tpm_tis.rst | 46 ++++++++++++++++++++++++++++++++++ + drivers/char/tpm/Kconfig | 1 + + drivers/char/tpm/eventlog/acpi.c | 1 - + drivers/char/tpm/tpm_infineon.c | 16 +++++++++--- + drivers/char/tpm/tpm_tis_core.c | 19 ++++++-------- + security/keys/gc.c | 8 ------ + security/keys/key.c | 35 ++++++++++++++++++-------- + security/keys/keyctl.c | 11 ++++---- + 9 files changed, 98 insertions(+), 40 deletions(-) + create mode 100644 Documentation/security/tpm/tpm_tis.rst +Merging watchdog/master (0bbac3facb5d Linux 6.9-rc4) +$ 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 (ef6e717d93c7 Merge branches 'arm/renesas', 'x86/amd', 'core' and 'x86/vt-d' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/filesystems/proc.rst +Auto-merging drivers/acpi/scan.c +CONFLICT (content): Merge conflict in drivers/acpi/scan.c +Auto-merging drivers/iommu/amd/amd_iommu.h +CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/iommu/intel/irq_remapping.c +Auto-merging include/linux/dma-map-ops.h +Resolved 'drivers/acpi/scan.c' using previous resolution. +Resolved 'drivers/iommu/amd/amd_iommu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 720f4287ef1b] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 2 +- + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + + Documentation/filesystems/proc.rst | 4 +- + arch/arc/mm/dma.c | 3 +- + arch/arm/mm/dma-mapping-nommu.c | 3 +- + arch/arm/mm/dma-mapping.c | 16 +- + arch/arm64/mm/dma-mapping.c | 5 +- + arch/loongarch/kernel/dma.c | 9 +- + arch/mips/mm/dma-noncoherent.c | 3 +- + arch/riscv/mm/dma-noncoherent.c | 3 +- + drivers/acpi/arm64/dma.c | 17 +- + drivers/acpi/arm64/iort.c | 20 +- + drivers/acpi/scan.c | 7 +- + drivers/hv/hv_common.c | 6 +- + drivers/iommu/amd/Kconfig | 2 + + drivers/iommu/amd/Makefile | 2 +- + drivers/iommu/amd/amd_iommu.h | 59 ++- + drivers/iommu/amd/amd_iommu_types.h | 33 ++ + drivers/iommu/amd/init.c | 173 ++++----- + drivers/iommu/amd/io_pgtable.c | 13 +- + drivers/iommu/amd/io_pgtable_v2.c | 18 +- + drivers/iommu/amd/iommu.c | 306 +++++++++------ + drivers/iommu/amd/pasid.c | 198 ++++++++++ + drivers/iommu/amd/ppr.c | 288 ++++++++++++++ + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 +- + drivers/iommu/dma-iommu.c | 46 +-- + drivers/iommu/dma-iommu.h | 14 +- + drivers/iommu/exynos-iommu.c | 14 +- + drivers/iommu/intel/Makefile | 2 +- + drivers/iommu/intel/cache.c | 419 +++++++++++++++++++++ + drivers/iommu/intel/debugfs.c | 7 - + drivers/iommu/intel/dmar.c | 26 +- + drivers/iommu/intel/iommu.c | 364 +++--------------- + drivers/iommu/intel/iommu.h | 88 +++-- + drivers/iommu/intel/irq_remapping.c | 16 +- + drivers/iommu/intel/nested.c | 69 +--- + drivers/iommu/intel/pasid.c | 18 +- + drivers/iommu/intel/perf.h | 1 - + drivers/iommu/intel/svm.c | 383 +++++-------------- + drivers/iommu/intel/trace.h | 97 +++++ + drivers/iommu/io-pgtable-arm.c | 15 +- + drivers/iommu/io-pgtable-dart.c | 37 +- + drivers/iommu/iommu-pages.h | 186 +++++++++ + drivers/iommu/iommu-sva.c | 16 +- + drivers/iommu/iommu.c | 48 +-- + drivers/iommu/irq_remapping.c | 5 +- + drivers/iommu/irq_remapping.h | 2 +- + drivers/iommu/rockchip-iommu.c | 14 +- + drivers/iommu/s390-iommu.c | 6 - + drivers/iommu/sun50i-iommu.c | 7 +- + drivers/iommu/tegra-smmu.c | 18 +- + drivers/iommu/virtio-iommu.c | 10 - + drivers/of/device.c | 42 +-- + include/linux/acpi_iort.h | 4 +- + include/linux/dma-direct.h | 18 + + include/linux/dma-map-ops.h | 6 +- + include/linux/dmar.h | 2 +- + include/linux/iommu.h | 16 +- + include/linux/mmzone.h | 5 +- + mm/vmstat.c | 3 + + 60 files changed, 1991 insertions(+), 1233 deletions(-) + create mode 100644 drivers/iommu/amd/pasid.c + create mode 100644 drivers/iommu/amd/ppr.c + create mode 100644 drivers/iommu/intel/cache.c + create mode 100644 drivers/iommu/iommu-pages.h +Merging audit/next (4cece7649650 Linux 6.9-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 (669430b183fc of: property: fw_devlink: Add support for "power-supplies" binding) +$ 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 drivers/of/dynamic.c +CONFLICT (content): Merge conflict in drivers/of/dynamic.c +Auto-merging drivers/of/property.c +CONFLICT (content): Merge conflict in drivers/of/property.c +Resolved 'drivers/of/dynamic.c' using previous resolution. +Resolved 'drivers/of/property.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8e8c21374bf4] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/atmel,lcdc-display.yaml | 103 +++++++++++++ + .../devicetree/bindings/display/atmel,lcdc.txt | 87 ----------- + .../devicetree/bindings/display/atmel,lcdc.yaml | 70 +++++++++ + .../bindings/display/exynos/exynos_dp.txt | 112 -------------- + .../display/samsung/samsung,exynos5-dp.yaml | 163 +++++++++++++++++++++ + .../allwinner,sun7i-a20-sc-nmi.yaml | 8 +- + .../interrupt-controller/renesas,irqc.yaml | 1 + + .../bindings/serial/fsl,s32-linflexuart.yaml | 4 +- + .../devicetree/bindings/timer/renesas,cmt.yaml | 2 + + .../devicetree/bindings/timer/renesas,tmu.yaml | 1 + + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 1 + + .../bindings/watchdog/aspeed,ast2400-wdt.yaml | 142 ++++++++++++++++++ + .../devicetree/bindings/watchdog/aspeed-wdt.txt | 73 --------- + drivers/of/address.c | 113 +++++--------- + drivers/of/base.c | 34 +---- + drivers/of/dynamic.c | 37 ++--- + drivers/of/of_private.h | 1 + + drivers/of/overlay.c | 11 +- + drivers/of/property.c | 30 ++-- + drivers/of/resolver.c | 35 ++--- + drivers/of/unittest.c | 12 +- + 21 files changed, 584 insertions(+), 456 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc-display.yaml + delete mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc.txt + create mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc.yaml + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_dp.txt + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos5-dp.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/aspeed,ast2400-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt +Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' 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 'ort' strategy. +Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (cecfc48904cf Merge remote-tracking branch 'spi/for-6.10' 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 MAINTAINERS +Auto-merging include/linux/gpio/property.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 8 +- + .../bindings/spi/marvell,armada-3700-spi.yaml | 55 +++++++++ + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 1 + + .../devicetree/bindings/spi/spi-armada-3700.txt | 25 ---- + Documentation/spi/pxa2xx.rst | 5 +- + Documentation/spi/spi-summary.rst | 5 - + MAINTAINERS | 2 +- + arch/arm/mach-pxa/devices.c | 18 --- + arch/arm/mach-pxa/spitz.c | 14 ++- + drivers/gpio/Kconfig | 9 ++ + drivers/gpio/gpiolib-swnode.c | 44 +++++++ + drivers/soc/pxa/ssp.c | 2 +- + drivers/spi/Kconfig | 5 +- + drivers/spi/spi-altera-platform.c | 1 - + drivers/spi/spi-amd.c | 112 ++++++++++++++++++ + drivers/spi/spi-atmel.c | 8 +- + drivers/spi/spi-au1550.c | 29 ++--- + drivers/spi/spi-cadence-quadspi.c | 109 ++++++++++++----- + drivers/spi/spi-cadence-xspi.c | 8 +- + drivers/spi/spi-coldfire-qspi.c | 1 - + drivers/spi/spi-cs42l43.c | 127 ++++++++++++++++++-- + drivers/spi/spi-fsl-cpm.c | 14 +-- + drivers/spi/spi-fsl-cpm.h | 5 +- + drivers/spi/spi-fsl-dspi.c | 1 - + drivers/spi/spi-fsl-spi.c | 7 +- + drivers/spi/spi-loopback-test.c | 1 - + drivers/spi/spi-mt65xx.c | 32 +++-- + drivers/spi/spi-mt7621.c | 95 +++++++-------- + drivers/spi/spi-mux.c | 2 + + drivers/spi/spi-oc-tiny.c | 2 - + drivers/spi/spi-omap2-mcspi.c | 95 +++++++++++---- + drivers/spi/spi-pxa2xx.c | 131 +++++++++++---------- + drivers/spi/spi-rspi.c | 12 +- + drivers/spi/spi-s3c64xx.c | 6 +- + drivers/spi/spi.c | 92 +++++++-------- + include/linux/gpio/property.h | 4 + + include/linux/platform_data/spi-omap2-mcspi.h | 3 - + include/linux/pxa2xx_ssp.h | 2 +- + include/linux/spi/pxa2xx_spi.h | 10 +- + include/linux/spi/rspi.h | 18 --- + include/linux/spi/spi.h | 12 +- + include/linux/spi/xilinx_spi.h | 14 ++- + 42 files changed, 736 insertions(+), 410 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/marvell,armada-3700-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-armada-3700.txt + delete mode 100644 include/linux/spi/rspi.h +Merging tip/master (d2b316f5173d Merge branch into tip/master: 'x86/shstk') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/st/stm32mp131.dtsi +Auto-merging arch/arm/boot/dts/st/stm32mp151.dtsi +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/boot/dts/st/stm32mp251.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi +Auto-merging arch/riscv/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/mm/init.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging init/main.c +Auto-merging kernel/events/core.c +Auto-merging kernel/workqueue.c +Auto-merging lib/Kconfig.debug +Resolved 'arch/arm64/boot/dts/st/stm32mp251.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6b06cd258b09] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 1 + + Documentation/arch/x86/resctrl.rst | 6 + + .../bindings/interrupt-controller/riscv,aplic.yaml | 172 ++++ + .../interrupt-controller/riscv,imsics.yaml | 172 ++++ + .../interrupt-controller/st,stm32-exti.yaml | 17 +- + Documentation/process/maintainer-tip.rst | 18 +- + Documentation/scheduler/sched-domains.rst | 12 +- + Documentation/scheduler/sched-stats.rst | 37 +- + .../translations/zh_CN/scheduler/sched-domains.rst | 10 +- + .../translations/zh_CN/scheduler/sched-stats.rst | 30 +- + MAINTAINERS | 20 + + arch/arm/boot/dts/st/stm32mp131.dtsi | 74 +- + arch/arm/boot/dts/st/stm32mp151.dtsi | 75 ++ + arch/arm/include/asm/topology.h | 6 +- + arch/arm/kernel/hw_breakpoint.c | 8 +- + arch/arm/kernel/topology.c | 2 +- + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/st/stm32mp251.dtsi | 176 +++++ + arch/arm64/include/asm/topology.h | 6 +- + arch/arm64/kernel/hw_breakpoint.c | 4 +- + arch/mips/dec/setup.c | 2 +- + arch/parisc/kernel/smp.c | 2 +- + arch/powerpc/include/asm/Kbuild | 1 - + arch/powerpc/include/asm/cputime.h | 13 - + arch/powerpc/include/asm/vdso/gettimeofday.h | 26 +- + arch/powerpc/kernel/time.c | 22 + + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/riscv/Kconfig | 2 + + arch/s390/include/asm/vdso/gettimeofday.h | 7 +- + arch/s390/include/asm/vtime.h | 2 - + arch/s390/kernel/irq.c | 1 + + arch/s390/kernel/nmi.c | 1 + + arch/um/include/asm/cpufeature.h | 3 +- + arch/x86/Kconfig | 43 +- + arch/x86/boot/compressed/head_64.S | 5 + + arch/x86/boot/compressed/sev.c | 197 +++-- + arch/x86/boot/main.c | 4 +- + arch/x86/entry/Makefile | 2 +- + arch/x86/entry/entry_64_compat.S | 1 - + arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + arch/x86/entry/{thunk_64.S => thunk.S} | 0 + arch/x86/entry/thunk_32.S | 18 - + arch/x86/events/amd/core.c | 37 +- + arch/x86/events/amd/lbr.c | 13 +- + arch/x86/events/intel/cstate.c | 116 +-- + arch/x86/events/intel/lbr.c | 3 +- + arch/x86/events/intel/pt.c | 12 +- + arch/x86/events/intel/uncore.c | 100 +-- + arch/x86/events/intel/uncore_nhmex.c | 3 +- + arch/x86/events/intel/uncore_snbep.c | 5 +- + arch/x86/events/msr.c | 116 +-- + arch/x86/events/perf_event.h | 13 + + arch/x86/events/rapl.c | 7 +- + arch/x86/hyperv/hv_vtl.c | 1 - + arch/x86/include/asm/alternative.h | 22 +- + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/asm.h | 3 - + arch/x86/include/asm/atomic.h | 12 +- + arch/x86/include/asm/atomic64_32.h | 81 +- + arch/x86/include/asm/atomic64_64.h | 12 +- + arch/x86/include/asm/boot.h | 5 - + arch/x86/include/asm/cmpxchg_32.h | 209 +++-- + arch/x86/include/asm/cmpxchg_64.h | 8 +- + arch/x86/include/asm/cpu_device_id.h | 101 +++ + arch/x86/include/asm/cpufeature.h | 16 +- + arch/x86/include/asm/e820/api.h | 1 + + arch/x86/include/asm/extable_fixup_types.h | 2 +- + arch/x86/include/asm/ia32.h | 11 - + arch/x86/include/asm/ia32_unistd.h | 12 - + arch/x86/include/asm/intel-family.h | 84 ++ + arch/x86/include/asm/irq_stack.h | 2 +- + arch/x86/include/asm/mce.h | 2 + + arch/x86/include/asm/msr-index.h | 9 +- + arch/x86/include/asm/page_types.h | 8 +- + arch/x86/include/asm/percpu.h | 157 ++-- + arch/x86/include/asm/pgtable_types.h | 2 + + arch/x86/include/asm/processor.h | 32 +- + arch/x86/include/asm/prom.h | 9 +- + arch/x86/include/asm/qspinlock.h | 13 +- + arch/x86/include/asm/qspinlock_paravirt.h | 7 +- + arch/x86/include/asm/seccomp.h | 2 +- + arch/x86/include/asm/sev.h | 4 +- + arch/x86/include/asm/special_insns.h | 8 +- + arch/x86/include/asm/string_64.h | 45 +- + arch/x86/include/asm/text-patching.h | 2 +- + arch/x86/include/asm/uaccess.h | 4 +- + arch/x86/include/asm/vdso/gettimeofday.h | 42 +- + arch/x86/include/asm/vm86.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/alternative.c | 135 ++-- + arch/x86/kernel/apic/apic.c | 46 +- + arch/x86/kernel/apic/x2apic_cluster.c | 7 +- + arch/x86/kernel/callthunks.c | 9 +- + arch/x86/kernel/cpu/amd.c | 12 + + arch/x86/kernel/cpu/aperfmperf.c | 17 +- + arch/x86/kernel/cpu/bugs.c | 30 +- + arch/x86/kernel/cpu/common.c | 171 ++-- + arch/x86/kernel/cpu/cpuid-deps.c | 3 + + arch/x86/kernel/cpu/intel.c | 1 + + arch/x86/kernel/cpu/intel_epb.c | 12 +- + arch/x86/kernel/cpu/match.c | 5 +- + arch/x86/kernel/cpu/mce/core.c | 24 +- + arch/x86/kernel/cpu/mce/genpool.c | 36 +- + arch/x86/kernel/cpu/mce/intel.c | 21 +- + arch/x86/kernel/cpu/mce/severity.c | 27 +- + arch/x86/kernel/cpu/microcode/amd.c | 4 +- + arch/x86/kernel/cpu/microcode/intel.c | 5 +- + arch/x86/kernel/cpu/resctrl/core.c | 65 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 40 +- + arch/x86/kernel/cpu/resctrl/internal.h | 5 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 11 + + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 24 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 12 +- + .../cpu/resctrl/{pseudo_lock_event.h => trace.h} | 24 +- + arch/x86/kernel/cpu/topology_amd.c | 19 +- + arch/x86/kernel/cpu/topology_ext.c | 15 + + arch/x86/kernel/devicetree.c | 24 +- + arch/x86/kernel/dumpstack.c | 4 +- + arch/x86/kernel/e820.c | 7 +- + arch/x86/kernel/fpu/core.c | 4 +- + arch/x86/kernel/fpu/xstate.c | 4 +- + arch/x86/kernel/head_32.S | 13 +- + arch/x86/kernel/head_64.S | 4 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/rtc.c | 1 - + arch/x86/kernel/setup.c | 40 +- + arch/x86/kernel/sev.c | 14 +- + arch/x86/kernel/shstk.c | 4 +- + arch/x86/kernel/signal_32.c | 2 +- + arch/x86/kernel/signal_64.c | 6 + + arch/x86/kernel/smpboot.c | 28 +- + arch/x86/kernel/topology.c | 43 - + arch/x86/kernel/tsc.c | 8 +- + arch/x86/kernel/tsc_msr.c | 14 +- + arch/x86/kernel/vmlinux.lds.S | 10 +- + arch/x86/math-emu/fpu_etc.c | 9 +- + arch/x86/math-emu/fpu_trig.c | 6 +- + arch/x86/math-emu/reg_constant.c | 7 +- + arch/x86/mm/extable.c | 9 - + arch/x86/mm/fault.c | 7 +- + arch/x86/mm/init.c | 16 +- + arch/x86/mm/mem_encrypt.c | 7 + + arch/x86/mm/pat/set_memory.c | 68 +- + arch/x86/platform/ce4100/ce4100.c | 1 - + arch/x86/platform/iris/iris.c | 5 +- + arch/x86/platform/olpc/olpc-xo1-pm.c | 7 +- + arch/x86/platform/olpc/olpc-xo1-sci.c | 5 +- + arch/x86/purgatory/Makefile | 3 +- + arch/x86/tools/relocs.c | 371 ++++----- + arch/x86/virt/svm/sev.c | 36 + + arch/x86/virt/vmx/tdx/tdx.c | 1 - + arch/x86/xen/enlighten.c | 3 - + arch/x86/xen/xen-head.S | 2 +- + drivers/base/arch_topology.c | 26 +- + drivers/cpufreq/cpufreq.c | 36 + + drivers/cpufreq/qcom-cpufreq-hw.c | 4 +- + drivers/cpuidle/coupled.c | 13 +- + drivers/irqchip/Kconfig | 27 +- + drivers/irqchip/Makefile | 3 + + drivers/irqchip/irq-alpine-msi.c | 2 +- + drivers/irqchip/irq-bcm6345-l1.c | 6 +- + drivers/irqchip/irq-brcmstb-l2.c | 17 +- + drivers/irqchip/irq-gic-v3-its.c | 17 +- + drivers/irqchip/irq-loongson-eiointc.c | 12 +- + drivers/irqchip/irq-loongson-pch-msi.c | 2 +- + drivers/irqchip/irq-loongson-pch-pic.c | 76 +- + drivers/irqchip/irq-mxs.c | 2 +- + drivers/irqchip/irq-renesas-rzg2l.c | 28 +- + drivers/irqchip/irq-riscv-aplic-direct.c | 323 ++++++++ + drivers/irqchip/irq-riscv-aplic-main.c | 211 +++++ + drivers/irqchip/irq-riscv-aplic-main.h | 52 ++ + drivers/irqchip/irq-riscv-aplic-msi.c | 257 ++++++ + drivers/irqchip/irq-riscv-imsic-early.c | 201 +++++ + drivers/irqchip/irq-riscv-imsic-platform.c | 375 +++++++++ + drivers/irqchip/irq-riscv-imsic-state.c | 865 +++++++++++++++++++++ + drivers/irqchip/irq-riscv-imsic-state.h | 108 +++ + drivers/irqchip/irq-sifive-plic.c | 7 +- + drivers/irqchip/irq-stm32-exti.c | 139 +++- + drivers/irqchip/irq-sunxi-nmi.c | 1 - + drivers/irqchip/irq-tb10x.c | 1 - + drivers/thermal/cpufreq_cooling.c | 3 - + drivers/virt/coco/sev-guest/sev-guest.c | 28 +- + include/asm-generic/sections.h | 5 + + include/asm-generic/vmlinux.lds.h | 8 +- + include/asm-generic/vtime.h | 1 - + include/linux/arch_topology.h | 8 +- + include/linux/cpufreq.h | 10 + + include/linux/cpuhotplug.h | 1 + + include/linux/cpumask.h | 17 + + include/linux/find.h | 27 + + include/linux/irq.h | 2 +- + include/linux/irqchip/riscv-aplic.h | 145 ++++ + include/linux/irqchip/riscv-imsic.h | 87 +++ + include/linux/irqdesc.h | 16 +- + include/linux/jump_label.h | 3 + + include/linux/kernel_stat.h | 8 + + include/linux/math64.h | 8 +- + include/linux/perf_event.h | 37 +- + include/linux/sched.h | 3 +- + include/linux/sched/idle.h | 2 +- + include/linux/sched/topology.h | 10 +- + include/linux/timerqueue.h | 5 - + include/linux/vtime.h | 5 - + .../events/{thermal_pressure.h => hw_pressure.h} | 14 +- + include/trace/events/mce.h | 25 +- + include/trace/events/sched.h | 2 +- + include/vdso/datapage.h | 4 + + include/vdso/math64.h | 38 + + init/Kconfig | 12 +- + init/init_task.c | 1 + + init/main.c | 1 + + kernel/context_tracking.c | 2 +- + kernel/events/core.c | 273 ++++--- + kernel/events/ring_buffer.c | 4 + + kernel/irq/Kconfig | 4 + + kernel/irq/cpuhotplug.c | 27 +- + kernel/irq/internals.h | 9 +- + kernel/irq/irqdesc.c | 65 +- + kernel/irq/irqdomain.c | 5 +- + kernel/irq/manage.c | 28 +- + kernel/irq/proc.c | 9 +- + kernel/irq/resend.c | 2 +- + kernel/jump_label.c | 53 ++ + kernel/locking/lock_events.h | 4 +- + kernel/locking/qspinlock.c | 13 +- + kernel/locking/qspinlock_paravirt.h | 49 +- + kernel/sched/core.c | 14 +- + kernel/sched/cputime.c | 13 - + kernel/sched/fair.c | 501 +++++++----- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.c | 22 +- + kernel/sched/pelt.h | 16 +- + kernel/sched/sched.h | 71 +- + kernel/sched/stats.c | 5 +- + kernel/sched/topology.c | 56 +- + kernel/softirq.c | 12 +- + kernel/time/clockevents.c | 2 +- + kernel/time/clocksource.c | 44 +- + kernel/time/hrtimer.c | 41 +- + kernel/time/timekeeping.c | 106 +-- + kernel/time/timer.c | 2 +- + kernel/time/vsyscall.c | 6 + + kernel/watchdog.c | 215 ++++- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 16 +- + lib/find_bit.c | 12 + + lib/vdso/Kconfig | 7 + + lib/vdso/gettimeofday.c | 55 +- + rust/kernel/time.rs | 60 ++ + scripts/gdb/linux/interrupts.py | 6 +- + tools/testing/selftests/bpf/prog_tests/perf_skip.c | 137 ++++ + tools/testing/selftests/bpf/progs/test_perf_skip.c | 15 + + .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 2 +- + tools/testing/selftests/perf_events/.gitignore | 1 + + tools/testing/selftests/perf_events/Makefile | 2 +- + .../selftests/perf_events/watermark_signal.c | 146 ++++ + tools/testing/selftests/x86/amx.c | 27 +- + tools/testing/selftests/x86/lam.c | 2 +- + 258 files changed, 7173 insertions(+), 2476 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,aplic.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,imsics.yaml + rename arch/x86/entry/{thunk_64.S => thunk.S} (100%) + delete mode 100644 arch/x86/entry/thunk_32.S + delete mode 100644 arch/x86/include/asm/ia32_unistd.h + rename arch/x86/kernel/cpu/resctrl/{pseudo_lock_event.h => trace.h} (56%) + delete mode 100644 arch/x86/kernel/topology.c + create mode 100644 drivers/irqchip/irq-riscv-aplic-direct.c + create mode 100644 drivers/irqchip/irq-riscv-aplic-main.c + create mode 100644 drivers/irqchip/irq-riscv-aplic-main.h + create mode 100644 drivers/irqchip/irq-riscv-aplic-msi.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-early.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-platform.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-state.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-state.h + delete mode 100644 include/asm-generic/vtime.h + create mode 100644 include/linux/irqchip/riscv-aplic.h + create mode 100644 include/linux/irqchip/riscv-imsic.h + rename include/trace/events/{thermal_pressure.h => hw_pressure.h} (55%) + create mode 100644 tools/testing/selftests/bpf/prog_tests/perf_skip.c + create mode 100644 tools/testing/selftests/bpf/progs/test_perf_skip.c + create mode 100644 tools/testing/selftests/perf_events/watermark_signal.c +Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (03db22b93a01 Merge ras/edac-urgent into for-next) +$ 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 +Merge made by the 'ort' strategy. + drivers/edac/altera_edac.c | 8 +++--- + drivers/edac/amd64_edac.h | 1 - + drivers/edac/amd8111_edac.c | 3 +-- + drivers/edac/armada_xp_edac.c | 2 +- + drivers/edac/cpc925_edac.c | 2 +- + drivers/edac/edac_device.c | 53 ++-------------------------------------- + drivers/edac/edac_device.h | 22 +++-------------- + drivers/edac/edac_device_sysfs.c | 22 +++-------------- + drivers/edac/edac_mc_sysfs.c | 47 +++++++++++++++++------------------ + drivers/edac/edac_pci.h | 5 ---- + drivers/edac/highbank_l2_edac.c | 2 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/octeon_edac-l2c.c | 2 +- + drivers/edac/octeon_edac-pc.c | 2 +- + drivers/edac/qcom_edac.c | 1 - + drivers/edac/sifive_edac.c | 3 +-- + drivers/edac/skx_common.c | 2 +- + drivers/edac/thunderx_edac.c | 6 ++--- + drivers/edac/versal_edac.c | 12 ++++----- + drivers/edac/xgene_edac.c | 10 +++----- + drivers/edac/zynqmp_edac.c | 2 +- + 21 files changed, 56 insertions(+), 153 deletions(-) +Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Already up to date. +Merging rcu/rcu/next (b93b7b4635f1 ftrace: Asynchronous grace period for register_ftrace_direct()) +$ 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 .mailmap +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +CONFLICT (content): Merge conflict in arch/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/x86/kernel/tsc.c +Auto-merging kernel/bpf/Kconfig +Auto-merging kernel/bpf/trampoline.c +Auto-merging kernel/trace/Kconfig +Auto-merging lib/Makefile +Resolved 'arch/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 27e2b8bcf09a] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 3 +- + .../RCU/Design/Requirements/Requirements.rst | 16 + + Documentation/RCU/whatisRCU.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 14 + + Documentation/atomic_t.txt | 4 +- + Documentation/litmus-tests/README | 45 ++ + .../atomic/cmpxchg-fail-ordered-1.litmus | 35 ++ + .../atomic/cmpxchg-fail-ordered-2.litmus | 30 ++ + .../atomic/cmpxchg-fail-unordered-1.litmus | 34 ++ + .../atomic/cmpxchg-fail-unordered-2.litmus | 30 ++ + MAINTAINERS | 2 +- + arch/Kconfig | 7 +- + arch/arc/Kconfig | 1 + + arch/arc/include/asm/cmpxchg.h | 33 +- + arch/csky/Kconfig | 1 + + arch/csky/include/asm/cmpxchg.h | 10 + + arch/parisc/include/asm/cmpxchg.h | 22 +- + arch/parisc/kernel/parisc_ksyms.c | 2 + + arch/parisc/lib/bitops.c | 50 +-- + arch/sh/Kconfig | 1 + + arch/sh/include/asm/cmpxchg.h | 3 + + arch/sparc/include/asm/cmpxchg_32.h | 20 +- + arch/sparc/lib/atomic32.c | 43 +- + arch/x86/kernel/tsc.c | 2 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/cmpxchg.h | 2 + + include/linux/cmpxchg-emu.h | 15 + + include/linux/rcupdate.h | 82 +++- + include/linux/rcupdate_wait.h | 18 +- + include/linux/srcutiny.h | 2 + + include/trace/events/rcu.h | 27 ++ + kernel/bpf/Kconfig | 2 +- + kernel/bpf/trampoline.c | 2 +- + kernel/rcu/Kconfig | 8 +- + kernel/rcu/rcu.h | 20 +- + kernel/rcu/rcutorture.c | 133 +++--- + kernel/rcu/srcutiny.c | 31 +- + kernel/rcu/srcutree.c | 5 +- + kernel/rcu/sync.c | 8 +- + kernel/rcu/tasks.h | 44 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 461 +++++++++++++++++++-- + kernel/rcu/tree.h | 25 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 4 +- + kernel/rcu/tree_stall.h | 11 +- + kernel/rcu/update.c | 4 +- + kernel/trace/Kconfig | 4 +- + kernel/trace/ftrace.c | 16 +- + lib/Makefile | 1 + + lib/cmpxchg-emu.c | 45 ++ + tools/testing/selftests/rcutorture/bin/torture.sh | 6 +- + .../selftests/rcutorture/configs/rcu/TREE09 | 5 +- + 53 files changed, 1147 insertions(+), 255 deletions(-) + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-1.litmus + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-2.litmus + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-1.litmus + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-2.litmus + create mode 100644 include/linux/cmpxchg-emu.h + create mode 100644 lib/cmpxchg-emu.c +Merging kvm/next (a96cb3bf390e Merge x86 bugfixes from Linux 6.9-rc3) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/fpu/xstate.c +Auto-merging arch/x86/kvm/Makefile +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/mmu/tdp_mmu.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/svm/svm.c +CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging mm/ksm.c +Auto-merging mm/memory.c +Auto-merging mm/migrate_device.c +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/set_memory_region_test.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/x86/kvm/svm/svm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 78fe795947bc] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 2 + + .../virt/kvm/x86/amd-memory-encryption.rst | 52 ++- + arch/arm64/kvm/mmu.c | 34 -- + arch/loongarch/include/asm/kvm_host.h | 1 - + arch/loongarch/kvm/mmu.c | 32 -- + arch/mips/kvm/mmu.c | 30 -- + arch/powerpc/include/asm/kvm_ppc.h | 1 - + arch/powerpc/kvm/book3s.c | 5 - + arch/powerpc/kvm/book3s.h | 1 - + arch/powerpc/kvm/book3s_64_mmu_hv.c | 12 - + arch/powerpc/kvm/book3s_hv.c | 1 - + arch/powerpc/kvm/book3s_pr.c | 7 - + arch/powerpc/kvm/e500_mmu_host.c | 6 - + arch/riscv/kvm/mmu.c | 20 -- + arch/x86/include/asm/fpu/api.h | 3 + + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm_host.h | 12 +- + arch/x86/include/uapi/asm/kvm.h | 20 +- + arch/x86/kernel/fpu/xstate.c | 1 + + arch/x86/kernel/fpu/xstate.h | 2 - + arch/x86/kvm/Makefile | 9 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 67 +--- + arch/x86/kvm/mmu/spte.c | 16 - + arch/x86/kvm/mmu/spte.h | 2 - + arch/x86/kvm/mmu/tdp_mmu.c | 46 --- + arch/x86/kvm/mmu/tdp_mmu.h | 1 - + arch/x86/kvm/svm/sev.c | 234 +++++++++---- + arch/x86/kvm/svm/svm.c | 27 +- + arch/x86/kvm/svm/svm.h | 54 ++- + arch/x86/kvm/vmx/main.c | 166 +++++++++ + arch/x86/kvm/vmx/vmx.c | 385 ++++++--------------- + arch/x86/kvm/vmx/x86_ops.h | 124 +++++++ + arch/x86/kvm/x86.c | 221 +++++++----- + arch/x86/kvm/x86.h | 2 + + include/linux/kvm_host.h | 2 - + include/linux/mmu_notifier.h | 44 --- + include/trace/events/kvm.h | 15 - + kernel/events/uprobes.c | 6 +- + mm/ksm.c | 4 +- + mm/memory.c | 7 +- + mm/migrate_device.c | 8 +- + mm/mmu_notifier.c | 17 - + tools/testing/selftests/kvm/Makefile | 1 + + .../testing/selftests/kvm/include/kvm_util_base.h | 11 +- + .../selftests/kvm/include/x86_64/processor.h | 6 - + tools/testing/selftests/kvm/include/x86_64/sev.h | 19 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 1 - + tools/testing/selftests/kvm/lib/x86_64/processor.c | 14 +- + tools/testing/selftests/kvm/lib/x86_64/sev.c | 44 ++- + .../testing/selftests/kvm/set_memory_region_test.c | 8 +- + .../testing/selftests/kvm/x86_64/sev_init2_tests.c | 152 ++++++++ + .../testing/selftests/kvm/x86_64/sev_smoke_test.c | 96 ++++- + virt/kvm/kvm_main.c | 50 +-- + 54 files changed, 1181 insertions(+), 923 deletions(-) + create mode 100644 arch/x86/kvm/vmx/main.c + create mode 100644 arch/x86/kvm/vmx/x86_ops.h + create mode 100644 tools/testing/selftests/kvm/x86_64/sev_init2_tests.c +Merging kvm-arm/next (135c8fabdedd Merge branch kvm-arm64/lpi-xa-cache 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 tools/testing/selftests/kvm/Makefile +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/arm64/include/asm/esr.h | 12 + + arch/arm64/include/asm/kvm_emulate.h | 14 +- + arch/arm64/include/asm/kvm_host.h | 115 +++- + arch/arm64/include/asm/kvm_nested.h | 13 + + arch/arm64/include/asm/kvm_ptrauth.h | 21 + + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/kvm/Makefile | 1 + + arch/arm64/kvm/arm.c | 91 +++- + arch/arm64/kvm/emulate-nested.c | 66 ++- + arch/arm64/kvm/fpsimd.c | 13 +- + arch/arm64/kvm/handle_exit.c | 36 +- + arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 8 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 82 +-- + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 8 +- + arch/arm64/kvm/hyp/nvhe/ffa.c | 1 - + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 3 - + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 2 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 3 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 10 +- + arch/arm64/kvm/hyp/vhe/switch.c | 102 +++- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 4 +- + arch/arm64/kvm/nested.c | 8 +- + arch/arm64/kvm/pauth.c | 206 ++++++++ + arch/arm64/kvm/pmu.c | 2 +- + arch/arm64/kvm/sys_regs.c | 6 +- + arch/arm64/kvm/vgic/vgic-debug.c | 82 ++- + arch/arm64/kvm/vgic/vgic-init.c | 8 - + arch/arm64/kvm/vgic/vgic-its.c | 356 ++++--------- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +- + arch/arm64/kvm/vgic/vgic.c | 6 +- + arch/arm64/kvm/vgic/vgic.h | 6 +- + include/kvm/arm_vgic.h | 13 +- + tools/testing/selftests/kvm/Makefile | 2 + + tools/testing/selftests/kvm/aarch64/arch_timer.c | 8 +- + tools/testing/selftests/kvm/aarch64/psci_test.c | 2 + + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 15 +- + .../selftests/kvm/aarch64/vgic_lpi_stress.c | 410 ++++++++++++++ + .../selftests/kvm/aarch64/vpmu_counter_access.c | 6 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 5 +- + tools/testing/selftests/kvm/include/aarch64/gic.h | 21 +- + .../testing/selftests/kvm/include/aarch64/gic_v3.h | 588 +++++++++++++++++++-- + .../selftests/kvm/include/aarch64/gic_v3_its.h | 19 + + .../selftests/kvm/include/aarch64/processor.h | 19 +- + tools/testing/selftests/kvm/include/aarch64/vgic.h | 5 +- + tools/testing/selftests/kvm/lib/aarch64/gic.c | 18 +- + .../selftests/kvm/lib/aarch64/gic_private.h | 4 +- + tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 99 ++-- + .../testing/selftests/kvm/lib/aarch64/gic_v3_its.c | 248 +++++++++ + tools/testing/selftests/kvm/lib/aarch64/vgic.c | 38 +- + virt/kvm/kvm_main.c | 14 +- + virt/kvm/vfio.c | 2 + + 51 files changed, 2205 insertions(+), 619 deletions(-) + create mode 100644 arch/arm64/kvm/pauth.c + create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_lpi_stress.c + create mode 100644 tools/testing/selftests/kvm/include/aarch64/gic_v3_its.h + create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic_v3_its.c +Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2) +$ 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-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Auto-merging drivers/perf/riscv_pmu_sbi.c +Auto-merging tools/testing/selftests/kvm/Makefile +Merge made by the 'ort' strategy. + arch/riscv/include/asm/csr.h | 5 +- + arch/riscv/include/asm/kvm_host.h | 21 +- + arch/riscv/include/asm/kvm_vcpu_pmu.h | 16 +- + arch/riscv/include/asm/sbi.h | 38 +- + arch/riscv/include/uapi/asm/kvm.h | 1 + + arch/riscv/kernel/paravirt.c | 6 +- + arch/riscv/kvm/aia.c | 5 + + arch/riscv/kvm/main.c | 18 +- + arch/riscv/kvm/vcpu.c | 85 ++- + arch/riscv/kvm/vcpu_exit.c | 4 + + arch/riscv/kvm/vcpu_onereg.c | 6 + + arch/riscv/kvm/vcpu_pmu.c | 260 +++++++- + arch/riscv/kvm/vcpu_sbi.c | 7 +- + arch/riscv/kvm/vcpu_sbi_hsm.c | 42 +- + arch/riscv/kvm/vcpu_sbi_pmu.c | 17 +- + arch/riscv/kvm/vcpu_sbi_sta.c | 4 +- + arch/riscv/kvm/vm.c | 1 + + drivers/perf/riscv_pmu.c | 3 +- + drivers/perf/riscv_pmu_sbi.c | 316 +++++++++- + include/linux/perf/riscv_pmu.h | 8 + + tools/testing/selftests/kvm/Makefile | 2 + + .../selftests/kvm/include/riscv/processor.h | 49 +- + tools/testing/selftests/kvm/include/riscv/sbi.h | 141 +++++ + tools/testing/selftests/kvm/include/riscv/ucall.h | 1 + + tools/testing/selftests/kvm/lib/riscv/processor.c | 12 + + tools/testing/selftests/kvm/riscv/arch_timer.c | 2 +- + tools/testing/selftests/kvm/riscv/ebreak_test.c | 82 +++ + tools/testing/selftests/kvm/riscv/get-reg-list.c | 4 + + tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 681 +++++++++++++++++++++ + tools/testing/selftests/kvm/steal_time.c | 4 +- + 30 files changed, 1674 insertions(+), 167 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/riscv/sbi.h + create mode 100644 tools/testing/selftests/kvm/riscv/ebreak_test.c + create mode 100644 tools/testing/selftests/kvm/riscv/sbi_pmu_test.c +Merging kvm-x86/next (2489e6c9ebb5 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/aarch64/arch_timer.c +Auto-merging tools/testing/selftests/kvm/aarch64/psci_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/aarch64/psci_test.c +Auto-merging tools/testing/selftests/kvm/dirty_log_perf_test.c +Auto-merging tools/testing/selftests/kvm/include/aarch64/processor.h +Auto-merging tools/testing/selftests/kvm/lib/riscv/processor.c +Auto-merging tools/testing/selftests/kvm/riscv/arch_timer.c +Auto-merging tools/testing/selftests/kvm/steal_time.c +Auto-merging virt/kvm/kvm_main.c +Recorded preimage for 'tools/testing/selftests/kvm/aarch64/psci_test.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/kvm/aarch64/psci_test.c'. +[master 1b983b921f3f] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/kvm_host.h | 3 - + arch/x86/kvm/cpuid.c | 41 +- + arch/x86/kvm/kvm_emulate.h | 1 + + arch/x86/kvm/mmu.h | 2 + + arch/x86/kvm/mmu/mmu.c | 5 + + arch/x86/kvm/mmu/page_track.c | 2 +- + arch/x86/kvm/mmu/paging_tmpl.h | 14 +- + arch/x86/kvm/mmu/tdp_mmu.c | 75 +- + arch/x86/kvm/vmx/nested.c | 30 +- + arch/x86/kvm/vmx/vmx.c | 2 - + arch/x86/kvm/x86.c | 6 +- + tools/testing/selftests/kvm/Makefile | 4 +- + tools/testing/selftests/kvm/aarch64/arch_timer.c | 3 +- + .../selftests/kvm/aarch64/page_fault_test.c | 5 +- + tools/testing/selftests/kvm/aarch64/psci_test.c | 3 - + tools/testing/selftests/kvm/aarch64/vgic_init.c | 1 - + tools/testing/selftests/kvm/arch_timer.c | 4 +- + tools/testing/selftests/kvm/demand_paging_test.c | 94 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 10 +- + tools/testing/selftests/kvm/dirty_log_test.c | 26 +- + tools/testing/selftests/kvm/guest_memfd_test.c | 4 +- + tools/testing/selftests/kvm/guest_print_test.c | 1 + + .../testing/selftests/kvm/hardware_disable_test.c | 3 - + .../selftests/kvm/include/aarch64/processor.h | 2 + + .../testing/selftests/kvm/include/aarch64/ucall.h | 2 +- + tools/testing/selftests/kvm/include/kvm_util.h | 1111 +++++++++++++++++++- + .../testing/selftests/kvm/include/kvm_util_base.h | 15 +- + .../testing/selftests/kvm/include/kvm_util_types.h | 20 + + tools/testing/selftests/kvm/include/memstress.h | 1 - + tools/testing/selftests/kvm/include/s390x/ucall.h | 2 +- + tools/testing/selftests/kvm/include/test_util.h | 19 + + .../selftests/kvm/include/userfaultfd_util.h | 19 +- + .../selftests/kvm/include/x86_64/kvm_util_arch.h | 28 + + .../selftests/kvm/include/x86_64/processor.h | 5 +- + tools/testing/selftests/kvm/include/x86_64/ucall.h | 2 +- + .../testing/selftests/kvm/kvm_binary_stats_test.c | 2 - + tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 2 - + tools/testing/selftests/kvm/kvm_page_table_test.c | 4 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 2 + + tools/testing/selftests/kvm/lib/assert.c | 3 - + tools/testing/selftests/kvm/lib/kvm_util.c | 12 +- + tools/testing/selftests/kvm/lib/memstress.c | 13 +- + tools/testing/selftests/kvm/lib/riscv/processor.c | 1 + + tools/testing/selftests/kvm/lib/test_util.c | 2 - + tools/testing/selftests/kvm/lib/ucall_common.c | 5 +- + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 156 +-- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 304 +++--- + tools/testing/selftests/kvm/lib/x86_64/sev.c | 1 - + .../testing/selftests/kvm/max_guest_memory_test.c | 2 - + .../kvm/memslot_modification_stress_test.c | 3 - + tools/testing/selftests/kvm/riscv/arch_timer.c | 4 +- + tools/testing/selftests/kvm/rseq_test.c | 13 +- + tools/testing/selftests/kvm/s390x/cmma_test.c | 3 +- + tools/testing/selftests/kvm/s390x/memop.c | 1 + + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 2 - + tools/testing/selftests/kvm/s390x/tprot.c | 1 + + .../testing/selftests/kvm/set_memory_region_test.c | 13 +- + tools/testing/selftests/kvm/steal_time.c | 49 +- + tools/testing/selftests/kvm/x86_64/amx_test.c | 4 - + .../kvm/x86_64/dirty_log_page_splitting_test.c | 1 + + .../kvm/x86_64/exit_on_emulation_failure_test.c | 5 +- + .../selftests/kvm/x86_64/fix_hypercall_test.c | 2 - + tools/testing/selftests/kvm/x86_64/hwcr_msr_test.c | 2 - + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 2 - + tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c | 3 - + .../testing/selftests/kvm/x86_64/hyperv_features.c | 6 - + tools/testing/selftests/kvm/x86_64/hyperv_ipi.c | 5 - + .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 1 - + .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 2 - + tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 3 - + .../selftests/kvm/x86_64/monitor_mwait_test.c | 4 +- + .../selftests/kvm/x86_64/nested_exceptions_test.c | 2 - + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 3 - + .../selftests/kvm/x86_64/nx_huge_pages_test.sh | 13 +- + .../selftests/kvm/x86_64/platform_info_test.c | 61 +- + .../selftests/kvm/x86_64/pmu_counters_test.c | 8 - + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 9 - + .../kvm/x86_64/private_mem_conversions_test.c | 1 - + .../testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 1 - + .../testing/selftests/kvm/x86_64/set_sregs_test.c | 1 - + .../kvm/x86_64/smaller_maxphyaddr_emulation_test.c | 6 - + tools/testing/selftests/kvm/x86_64/smm_test.c | 1 - + tools/testing/selftests/kvm/x86_64/state_test.c | 1 - + .../selftests/kvm/x86_64/svm_int_ctl_test.c | 3 - + .../kvm/x86_64/svm_nested_shutdown_test.c | 5 +- + .../kvm/x86_64/svm_nested_soft_inject_test.c | 5 +- + .../testing/selftests/kvm/x86_64/sync_regs_test.c | 2 - + .../selftests/kvm/x86_64/ucna_injection_test.c | 7 - + .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 15 +- + .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 3 - + .../vmx_exception_with_invalid_guest_state.c | 3 - + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 4 - + .../kvm/x86_64/vmx_preemption_timer_test.c | 1 - + .../testing/selftests/kvm/x86_64/xapic_ipi_test.c | 4 - + .../selftests/kvm/x86_64/xapic_state_test.c | 1 - + .../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 3 - + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 59 +- + tools/testing/selftests/kvm/x86_64/xss_msr_test.c | 2 - + virt/kvm/kvm_main.c | 16 +- + 99 files changed, 1794 insertions(+), 649 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/kvm_util_types.h +Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' 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 +Merge made by the 'ort' strategy. +Merging workqueues/for-next (24283babc61f Merge branch 'for-6.9-fixes' into for-next) +$ 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 +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 54 ++++- + include/trace/events/workqueue.h | 4 +- + kernel/workqueue.c | 467 +++++++++++++++++++++++---------------- + tools/workqueue/wq_monitor.py | 9 +- + 4 files changed, 334 insertions(+), 200 deletions(-) +Merging drivers-x86/for-next (5c94664cf279 platform/x86: asus-laptop: Use sysfs_emit() and sysfs_emit_at() to replace sprintf()) +$ 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 +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/platform/x86/asus-laptop.c +Auto-merging drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c +Auto-merging drivers/platform/x86/intel/vbtn.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging drivers/platform/x86/uv_sysfs.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9d77ad7a6657] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-platform-asus-wmi | 26 + + .../bindings/platform/acer,aspire1-ec.yaml | 60 +++ + Documentation/wmi/driver-development-guide.rst | 178 +++++++ + Documentation/wmi/index.rst | 1 + + MAINTAINERS | 23 +- + arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 40 +- + drivers/acpi/platform_profile.c | 39 ++ + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/arm64/Kconfig | 35 ++ + drivers/platform/arm64/Makefile | 8 + + drivers/platform/arm64/acer-aspire1-ec.c | 562 +++++++++++++++++++++ + .../platform/surface/surface_aggregator_registry.c | 43 +- + .../platform/surface/surface_platform_profile.c | 88 +++- + drivers/platform/x86/Kconfig | 25 + + drivers/platform/x86/Makefile | 4 + + drivers/platform/x86/amd/hsmp.c | 2 +- + drivers/platform/x86/amd/pmc/Kconfig | 15 + + drivers/platform/x86/amd/pmc/Makefile | 1 + + drivers/platform/x86/amd/pmc/mp2_stb.c | 280 ++++++++++ + drivers/platform/x86/amd/pmc/pmc.c | 4 + + drivers/platform/x86/amd/pmc/pmc.h | 15 + + drivers/platform/x86/asus-laptop.c | 44 +- + drivers/platform/x86/asus-wmi.c | 417 +++++++++++---- + drivers/platform/x86/hp/hp-wmi.c | 12 +- + drivers/platform/x86/huawei-wmi.c | 8 +- + drivers/platform/x86/ideapad-laptop.c | 140 ++++- + drivers/platform/x86/inspur_platform_profile.c | 1 + + drivers/platform/x86/intel/ifs/load.c | 2 + + drivers/platform/x86/intel/ifs/runtest.c | 27 +- + drivers/platform/x86/intel/pmc/arl.c | 2 +- + drivers/platform/x86/intel/pmc/lnl.c | 2 +- + drivers/platform/x86/intel/sdsi.c | 118 +++-- + .../intel/uncore-frequency/uncore-frequency-tpmi.c | 7 + + drivers/platform/x86/intel/vbtn.c | 3 +- + drivers/platform/x86/lenovo-wmi-camera.c | 127 +++++ + drivers/platform/x86/msi-laptop.c | 20 +- + drivers/platform/x86/p2sb.c | 15 +- + drivers/platform/x86/quickstart.c | 246 +++++++++ + drivers/platform/x86/samsung-laptop.c | 10 +- + drivers/platform/x86/think-lmi.c | 13 +- + drivers/platform/x86/thinkpad_acpi.c | 23 +- + drivers/platform/x86/toshiba_acpi.c | 36 +- + drivers/platform/x86/uv_sysfs.c | 20 +- + drivers/platform/x86/wmi.c | 60 ++- + drivers/platform/x86/x86-android-tablets/core.c | 14 +- + drivers/platform/x86/x86-android-tablets/dmi.c | 18 + + drivers/platform/x86/x86-android-tablets/lenovo.c | 216 ++++++++ + drivers/platform/x86/x86-android-tablets/other.c | 82 +++ + .../x86/x86-android-tablets/x86-android-tablets.h | 1 + + drivers/platform/x86/xiaomi-wmi.c | 30 +- + include/dt-bindings/leds/common.h | 1 + + include/linux/platform_data/x86/asus-wmi.h | 6 + + include/linux/platform_profile.h | 1 + + include/trace/events/intel_ifs.h | 2 +- + tools/arch/x86/intel_sdsi/intel_sdsi.c | 108 ++-- + 56 files changed, 2931 insertions(+), 353 deletions(-) + create mode 100644 Documentation/devicetree/bindings/platform/acer,aspire1-ec.yaml + create mode 100644 Documentation/wmi/driver-development-guide.rst + create mode 100644 drivers/platform/arm64/Kconfig + create mode 100644 drivers/platform/arm64/Makefile + create mode 100644 drivers/platform/arm64/acer-aspire1-ec.c + create mode 100644 drivers/platform/x86/amd/pmc/mp2_stb.c + create mode 100644 drivers/platform/x86/lenovo-wmi-camera.c + create mode 100644 drivers/platform/x86/quickstart.c +Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion) +$ 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 +Auto-merging drivers/platform/chrome/wilco_ec/event.c +Merge made by the 'ort' strategy. + drivers/platform/chrome/Kconfig | 1 + + drivers/platform/chrome/cros_ec.c | 16 ++--- + drivers/platform/chrome/cros_ec_chardev.c | 9 ++- + drivers/platform/chrome/cros_ec_debugfs.c | 9 ++- + drivers/platform/chrome/cros_ec_lightbar.c | 9 ++- + drivers/platform/chrome/cros_ec_lpc.c | 81 ++++++++++++++++++++++-- + drivers/platform/chrome/cros_ec_proto_test.c | 72 +++++++++------------ + drivers/platform/chrome/cros_ec_sensorhub.c | 9 ++- + drivers/platform/chrome/cros_ec_sysfs.c | 9 ++- + drivers/platform/chrome/cros_ec_vbc.c | 9 ++- + drivers/platform/chrome/cros_hps_i2c.c | 4 +- + drivers/platform/chrome/cros_kbd_led_backlight.c | 11 +++- + drivers/platform/chrome/cros_usbpd_logger.c | 9 ++- + drivers/platform/chrome/cros_usbpd_notify.c | 9 ++- + drivers/platform/chrome/wilco_ec/Kconfig | 1 + + drivers/platform/chrome/wilco_ec/core.c | 9 ++- + drivers/platform/chrome/wilco_ec/debugfs.c | 9 ++- + drivers/platform/chrome/wilco_ec/event.c | 1 - + drivers/platform/chrome/wilco_ec/sysfs.c | 2 +- + drivers/platform/chrome/wilco_ec/telemetry.c | 9 ++- + 20 files changed, 214 insertions(+), 74 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Merge made by the 'ort' strategy. + drivers/firmware/google/cbmem.c | 1 - + drivers/firmware/google/coreboot_table.c | 6 ++++-- + drivers/firmware/google/coreboot_table.h | 6 +++++- + 3 files changed, 9 insertions(+), 4 deletions(-) +Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/controllers/omap_ssi_core.c | 6 ++---- + drivers/hsi/controllers/omap_ssi_port.c | 6 ++---- + 2 files changed, 4 insertions(+), 8 deletions(-) +Merging leds-lj/for-leds-next (fd05e3698649 leds: mt6360: Fix the second LED can not enable torch mode by V4L2) +$ 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 include/dt-bindings/leds/common.h +Auto-merging sound/core/control_led.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 8 +- + .../devicetree/bindings/leds/nxp,pca963x.yaml | 140 +++++++++++++++++++++ + Documentation/devicetree/bindings/leds/pca963x.txt | 52 -------- + arch/mips/configs/ci20_defconfig | 1 - + drivers/leds/flash/leds-mt6360.c | 12 +- + drivers/leds/led-triggers.c | 6 +- + drivers/leds/leds-an30259a.c | 14 +-- + drivers/leds/leds-apu.c | 3 +- + drivers/leds/leds-aw200xx.c | 32 +++-- + drivers/leds/leds-aw2013.c | 25 ++-- + drivers/leds/leds-lm3532.c | 29 +++-- + drivers/leds/leds-lp3952.c | 21 ++-- + drivers/leds/leds-mlxreg.c | 14 +-- + drivers/leds/leds-nic78bx.c | 23 ++-- + drivers/leds/rgb/leds-qcom-lpg.c | 8 ++ + drivers/leds/simple/simatic-ipc-leds-gpio-core.c | 1 + + drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c | 52 +++++++- + drivers/leds/trigger/Kconfig | 7 -- + drivers/leds/trigger/Makefile | 1 - + drivers/leds/trigger/ledtrig-audio.c | 67 ---------- + drivers/leds/trigger/ledtrig-netdev.c | 2 - + include/dt-bindings/leds/common.h | 3 + + include/linux/leds.h | 29 ++--- + include/linux/mutex.h | 27 ++++ + kernel/locking/mutex-debug.c | 12 ++ + sound/core/Kconfig | 1 - + sound/core/control_led.c | 20 ++- + 27 files changed, 375 insertions(+), 235 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/nxp,pca963x.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/pca963x.txt + delete mode 100644 drivers/leds/trigger/ledtrig-audio.c +Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/Makefile | 11 ++++------- + drivers/char/ipmi/bt-bmc.c | 5 ++--- + drivers/char/ipmi/ipmi_msghandler.c | 29 ++++++++++++++--------------- + drivers/char/ipmi/ipmi_powernv.c | 6 ++---- + drivers/char/ipmi/ipmi_si_intf.c | 3 ++- + drivers/char/ipmi/ipmi_si_pci.c | 3 +++ + drivers/char/ipmi/ipmi_si_platform.c | 6 ++---- + drivers/char/ipmi/ipmi_ssif.c | 5 ++--- + drivers/char/ipmi/kcs_bmc_aspeed.c | 6 ++---- + drivers/char/ipmi/kcs_bmc_npcm7xx.c | 6 ++---- + 10 files changed, 35 insertions(+), 45 deletions(-) +Merging driver-core/driver-core-next (e5019b14230a Merge 6.9-rc5 into driver-core-next) +$ 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 drivers/firmware/dmi_scan.c +Auto-merging drivers/gpu/drm/i915/gvt/firmware.c +Auto-merging drivers/thermal/intel/int340x_thermal/int3400_thermal.c +Merge made by the 'ort' strategy. + arch/powerpc/platforms/powernv/opal.c | 10 +----- + drivers/acpi/bgrt.c | 9 +---- + drivers/base/base.h | 9 +++-- + drivers/base/bus.c | 9 ++++- + drivers/base/core.c | 8 ----- + drivers/base/module.c | 42 ++++++++++++++++------ + drivers/firmware/dmi_scan.c | 12 ++----- + drivers/firmware/efi/rci2-table.c | 10 +----- + drivers/gpu/drm/i915/gvt/firmware.c | 26 ++++---------- + .../intel/int340x_thermal/int3400_thermal.c | 9 +---- + fs/sysfs/file.c | 27 ++++++++++++++ + include/linux/device.h | 11 ------ + include/linux/sysfs.h | 15 ++++++++ + init/initramfs.c | 10 +----- + kernel/module/sysfs.c | 13 +------ + 15 files changed, 101 insertions(+), 119 deletions(-) +Merging usb/usb-next (3f12222a4beb usb: dwc3: core: Fix compile warning on s390 gcc in dwc3_get_phy call) +$ 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 Documentation/devicetree/bindings/usb/dwc2.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/renesas/r9a07g043.dtsi +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/soc/qcom/pmic_glink.c +Auto-merging drivers/usb/dwc3/core.c +CONFLICT (content): Merge conflict in drivers/usb/dwc3/core.c +Auto-merging drivers/usb/dwc3/core.h +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/gadget/function/uvc_configfs.c +Resolved 'drivers/usb/dwc3/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1b0e672a1479] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + ...-usb-hub => sysfs-bus-platform-onboard-usb-dev} | 3 +- + .../devicetree/bindings/sound/xmos,xvf3500.yaml | 63 +++ + .../bindings/usb/chipidea,usb2-common.yaml | 200 ++++++++ + .../devicetree/bindings/usb/chipidea,usb2-imx.yaml | 287 +++++++++++ + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 360 +------------- + .../devicetree/bindings/usb/cypress,hx3.yaml | 1 - + Documentation/devicetree/bindings/usb/dwc2.yaml | 1 + + .../devicetree/bindings/usb/microchip,usb2514.yaml | 63 +++ + .../devicetree/bindings/usb/qcom,dwc3.yaml | 34 ++ + .../devicetree/bindings/usb/qcom,pmic-typec.yaml | 35 +- + .../devicetree/bindings/usb/renesas,usbhs.yaml | 6 +- + .../devicetree/bindings/usb/snps,dwc3.yaml | 13 +- + Documentation/devicetree/bindings/usb/usb-uhci.txt | 18 - + .../devicetree/bindings/usb/usb-uhci.yaml | 75 +++ + MAINTAINERS | 4 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +- + arch/arm64/configs/defconfig | 2 +- + drivers/gpu/drm/ci/arm64.config | 4 +- + drivers/soc/qcom/pmic_glink.c | 5 - + drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- + drivers/usb/chipidea/ci_hdrc_npcm.c | 6 +- + drivers/usb/chipidea/core.c | 8 +- + drivers/usb/chipidea/ulpi.c | 5 - + drivers/usb/core/Makefile | 4 +- + drivers/usb/core/hub.c | 8 +- + drivers/usb/core/hub.h | 2 +- + drivers/usb/dwc2/core.c | 42 ++ + drivers/usb/dwc2/core.h | 8 + + drivers/usb/dwc2/core_intr.c | 26 +- + drivers/usb/dwc2/debugfs.c | 1 + + drivers/usb/dwc2/gadget.c | 28 +- + drivers/usb/dwc2/hcd.c | 10 + + drivers/usb/dwc2/hcd_queue.c | 52 +- + drivers/usb/dwc2/hw.h | 14 + + drivers/usb/dwc2/params.c | 43 ++ + drivers/usb/dwc3/core.c | 354 +++++++++---- + drivers/usb/dwc3/core.h | 20 +- + drivers/usb/dwc3/drd.c | 15 +- + drivers/usb/dwc3/dwc3-exynos.c | 13 +- + drivers/usb/dwc3/dwc3-pci.c | 8 +- + drivers/usb/dwc3/dwc3-qcom.c | 265 ++++++---- + drivers/usb/gadget/function/f_fs.c | 20 +- + drivers/usb/gadget/function/f_hid.c | 6 +- + drivers/usb/gadget/function/f_printer.c | 6 +- + drivers/usb/gadget/function/rndis.c | 4 +- + drivers/usb/gadget/function/u_audio.c | 11 +- + drivers/usb/gadget/function/u_ether.c | 2 +- + drivers/usb/gadget/function/uvc_configfs.c | 14 +- + drivers/usb/gadget/function/uvc_v4l2.c | 24 +- + drivers/usb/gadget/udc/core.c | 9 + + drivers/usb/gadget/udc/dummy_hcd.c | 37 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 4 +- + drivers/usb/gadget/udc/omap_udc.c | 10 +- + drivers/usb/host/ehci-dbg.c | 10 +- + drivers/usb/host/ehci-exynos.c | 27 +- + drivers/usb/host/ehci-q.c | 20 +- + drivers/usb/host/ehci.h | 8 +- + drivers/usb/host/ohci-exynos.c | 27 +- + drivers/usb/misc/Kconfig | 16 +- + drivers/usb/misc/Makefile | 2 +- + drivers/usb/misc/onboard_usb_dev.c | 546 +++++++++++++++++++++ + .../misc/{onboard_usb_hub.h => onboard_usb_dev.h} | 62 ++- + ...ard_usb_hub_pdevs.c => onboard_usb_dev_pdevs.c} | 47 +- + drivers/usb/misc/onboard_usb_hub.c | 507 ------------------- + drivers/usb/misc/uss720.c | 42 +- + drivers/usb/phy/phy-fsl-usb.c | 1 - + drivers/usb/phy/phy-generic.c | 1 + + drivers/usb/renesas_usbhs/common.c | 41 +- + drivers/usb/renesas_usbhs/rza.h | 1 + + drivers/usb/renesas_usbhs/rza2.c | 13 + + drivers/usb/typec/altmodes/displayport.c | 1 - + drivers/usb/typec/altmodes/nvidia.c | 1 - + drivers/usb/typec/mux/Kconfig | 2 +- + drivers/usb/typec/mux/gpio-sbu-mux.c | 8 +- + drivers/usb/typec/mux/ptn36502.c | 44 +- + drivers/usb/typec/stusb160x.c | 2 +- + drivers/usb/typec/ucsi/ucsi.c | 225 +++++---- + drivers/usb/typec/ucsi/ucsi.h | 8 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 56 +-- + drivers/usb/typec/ucsi/ucsi_glink.c | 92 ++-- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 1 + + include/linux/usb/onboard_dev.h | 18 + + include/linux/usb/onboard_hub.h | 18 - + include/linux/usb/renesas_usbhs.h | 5 - + 87 files changed, 2474 insertions(+), 1641 deletions(-) + rename Documentation/ABI/testing/{sysfs-bus-platform-onboard-usb-hub => sysfs-bus-platform-onboard-usb-dev} (74%) + create mode 100644 Documentation/devicetree/bindings/sound/xmos,xvf3500.yaml + create mode 100644 Documentation/devicetree/bindings/usb/chipidea,usb2-common.yaml + create mode 100644 Documentation/devicetree/bindings/usb/chipidea,usb2-imx.yaml + create mode 100644 Documentation/devicetree/bindings/usb/microchip,usb2514.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb-uhci.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb-uhci.yaml + create mode 100644 drivers/usb/misc/onboard_usb_dev.c + rename drivers/usb/misc/{onboard_usb_hub.h => onboard_usb_dev.h} (56%) + rename drivers/usb/misc/{onboard_usb_hub_pdevs.c => onboard_usb_dev_pdevs.c} (68%) + delete mode 100644 drivers/usb/misc/onboard_usb_hub.c + create mode 100644 include/linux/usb/onboard_dev.h + delete mode 100644 include/linux/usb/onboard_hub.h +$ git am -3 ../patches/0001-fix-up-for-usb-misc-onboard_hub-rename-to-onboard_de.patch +Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/misc/onboard_usb_dev.c +$ git add -A . +$ git commit -v -a --amend +[master df40904d9e04] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git + Date: Tue Apr 30 15:03:23 2024 +1000 +Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets) +$ 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/tb.c +Auto-merging drivers/thunderbolt/usb4.c +Merge made by the 'ort' strategy. + drivers/thunderbolt/debugfs.c | 2 +- + drivers/thunderbolt/icm.c | 1 + + drivers/thunderbolt/retimer.c | 12 ++++++++---- + drivers/thunderbolt/tb.c | 9 +++++---- + drivers/thunderbolt/tb_msgs.h | 6 ------ + drivers/thunderbolt/trace.h | 13 +++++++++++-- + drivers/thunderbolt/tunnel.c | 39 +++++++++++++++++---------------------- + drivers/thunderbolt/usb4.c | 22 +++++++++++++++------- + drivers/thunderbolt/xdomain.c | 2 +- + include/linux/thunderbolt.h | 1 - + 10 files changed, 59 insertions(+), 48 deletions(-) +Merging usb-serial/usb-next (39cd87c4eb2b Linux 6.9-rc2) +$ 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 (660a70809856 Merge 6.9-rc5 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging include/linux/kfifo.h +CONFLICT (content): Merge conflict in include/linux/kfifo.h +Auto-merging include/linux/printk.h +Auto-merging lib/kfifo.c +CONFLICT (content): Merge conflict in lib/kfifo.c +Resolved 'include/linux/kfifo.h' using previous resolution. +Resolved 'lib/kfifo.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8007bf2d86d8] Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 19 + + Documentation/admin-guide/sysrq.rst | 9 + + .../bindings/serial/actions,owl-uart.txt | 16 - + .../bindings/serial/actions,owl-uart.yaml | 48 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + drivers/tty/amiserial.c | 8 +- + drivers/tty/hvc/hvc_xen.c | 2 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/serial/8250/8250_bcm7271.c | 14 +- + drivers/tty/serial/8250/8250_core.c | 8 +- + drivers/tty/serial/8250/8250_dma.c | 31 +- + drivers/tty/serial/8250/8250_dw.c | 45 +- + drivers/tty/serial/8250/8250_exar.c | 1028 ++++++++++++++++++-- + drivers/tty/serial/8250/8250_mtk.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 37 + + drivers/tty/serial/8250/8250_omap.c | 49 +- + drivers/tty/serial/8250/8250_pci1xxxx.c | 50 +- + drivers/tty/serial/8250/8250_pnp.c | 40 +- + drivers/tty/serial/8250/8250_port.c | 29 +- + drivers/tty/serial/Kconfig | 54 +- + drivers/tty/serial/Makefile | 2 + + drivers/tty/serial/amba-pl011.c | 62 +- + drivers/tty/serial/ar933x_uart.c | 18 +- + drivers/tty/serial/arc_uart.c | 8 +- + drivers/tty/serial/atmel_serial.c | 146 ++- + drivers/tty/serial/clps711x.c | 12 +- + drivers/tty/serial/cpm_uart.c | 20 +- + drivers/tty/serial/digicolor-usart.c | 12 +- + drivers/tty/serial/dz.c | 13 +- + drivers/tty/serial/fsl_linflexuart.c | 17 +- + drivers/tty/serial/fsl_lpuart.c | 45 +- + drivers/tty/serial/icom.c | 25 +- + drivers/tty/serial/imx.c | 61 +- + drivers/tty/serial/ip22zilog.c | 26 +- + drivers/tty/serial/jsm/jsm_cls.c | 31 +- + drivers/tty/serial/jsm/jsm_neo.c | 38 +- + drivers/tty/serial/max3100.c | 340 +++---- + drivers/tty/serial/max310x.c | 37 +- + drivers/tty/serial/men_z135_uart.c | 26 +- + drivers/tty/serial/meson_uart.c | 12 +- + drivers/tty/serial/milbeaut_usio.c | 15 +- + drivers/tty/serial/msm_serial.c | 122 +-- + drivers/tty/serial/mvebu-uart.c | 8 +- + drivers/tty/serial/mxs-auart.c | 23 +- + drivers/tty/serial/omap-serial.c | 1 - + drivers/tty/serial/pch_uart.c | 21 +- + drivers/tty/serial/pic32_uart.c | 17 +- + drivers/tty/serial/pmac_zilog.c | 33 +- + drivers/tty/serial/qcom_geni_serial.c | 34 +- + drivers/tty/serial/rda-uart.c | 17 +- + drivers/tty/serial/samsung_tty.c | 54 +- + drivers/tty/serial/sb1250-duart.c | 13 +- + drivers/tty/serial/sc16is7xx.c | 303 ++---- + drivers/tty/serial/sc16is7xx.h | 41 + + drivers/tty/serial/sc16is7xx_i2c.c | 67 ++ + drivers/tty/serial/sc16is7xx_spi.c | 90 ++ + drivers/tty/serial/sccnxp.c | 16 +- + drivers/tty/serial/serial-tegra.c | 43 +- + drivers/tty/serial/serial_base.h | 30 + + drivers/tty/serial/serial_base_bus.c | 129 +++ + drivers/tty/serial/serial_core.c | 147 ++- + drivers/tty/serial/serial_port.c | 9 +- + drivers/tty/serial/sh-sci.c | 51 +- + drivers/tty/serial/sifive.c | 4 +- + drivers/tty/serial/sprd_serial.c | 20 +- + drivers/tty/serial/st-asc.c | 4 +- + drivers/tty/serial/stm32-usart.c | 52 +- + drivers/tty/serial/sunhv.c | 35 +- + drivers/tty/serial/sunplus-uart.c | 16 +- + drivers/tty/serial/sunsab.c | 30 +- + drivers/tty/serial/sunsu.c | 15 +- + drivers/tty/serial/sunzilog.c | 27 +- + drivers/tty/serial/tegra-tcu.c | 10 +- + drivers/tty/serial/timbuart.c | 17 +- + drivers/tty/serial/uartlite.c | 13 +- + drivers/tty/serial/ucc_uart.c | 20 +- + drivers/tty/serial/xilinx_uartps.c | 20 +- + drivers/tty/serial/zs.c | 13 +- + drivers/tty/sysrq.c | 13 +- + drivers/tty/vt/conmakehash.c | 15 +- + include/linux/kfifo.h | 143 ++- + include/linux/pnp.h | 4 + + include/linux/printk.h | 7 + + include/linux/serial_core.h | 49 +- + include/linux/serial_max3100.h | 48 - + include/uapi/linux/kd.h | 96 +- + kernel/printk/Makefile | 2 +- + kernel/printk/conopt.c | 146 +++ + kernel/printk/console_cmdline.h | 6 + + kernel/printk/printk.c | 100 +- + lib/kfifo.c | 107 +- + 91 files changed, 3033 insertions(+), 1726 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/actions,owl-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/actions,owl-uart.yaml + create mode 100644 drivers/tty/serial/sc16is7xx.h + create mode 100644 drivers/tty/serial/sc16is7xx_i2c.c + create mode 100644 drivers/tty/serial/sc16is7xx_spi.c + delete mode 100644 include/linux/serial_max3100.h + create mode 100644 kernel/printk/conopt.c +Merging char-misc/char-misc-next (0b6896838d6a Merge tag 'w1-drv-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1 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 +Auto-merging Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/char/mem.c +Auto-merging drivers/iio/adc/pac1934.c +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c +Auto-merging drivers/iio/pressure/bmp280-core.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 3 +- + Documentation/ABI/testing/sysfs-bus-iio-ad9739a | 19 + + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 2 + + .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 279 ++++ + .../devicetree/bindings/iio/adc/adi,ad7944.yaml | 213 +++ + .../iio/adc/allwinner,sun20i-d1-gpadc.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad9739a.yaml | 95 ++ + .../devicetree/bindings/iio/dac/adi,axi-dac.yaml | 62 + + .../devicetree/bindings/iio/dac/ti,dac5571.yaml | 1 + + .../bindings/iio/health/maxim,max30102.yaml | 12 +- + .../bindings/iio/humidity/ti,hdc3020.yaml | 5 + + .../bindings/iio/imu/invensense,icm42600.yaml | 1 + + .../bindings/iio/imu/invensense,mpu6050.yaml | 17 +- + .../bindings/iio/light/avago,apds9300.yaml | 20 +- + .../bindings/iio/light/avago,apds9960.yaml | 44 - + .../bindings/iio/temperature/adi,ltc2983.yaml | 4 + + Documentation/iio/ad7944.rst | 130 ++ + Documentation/iio/index.rst | 1 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + MAINTAINERS | 58 +- + drivers/accessibility/speakup/devsynth.c | 57 +- + drivers/accessibility/speakup/speakup.h | 2 + + drivers/accessibility/speakup/synth.c | 92 +- + drivers/base/property.c | 14 - + drivers/cdx/controller/cdx_controller.c | 6 +- + drivers/char/mem.c | 6 +- + drivers/char/powernv-op-panel.c | 5 +- + drivers/char/sonypi.c | 6 +- + drivers/comedi/drivers/cb_pcidas64.c | 5 - + drivers/counter/counter-core.c | 4 +- + drivers/counter/stm32-timer-cnt.c | 461 ++++++- + drivers/counter/ti-ecap-capture.c | 8 +- + drivers/counter/ti-eqep.c | 6 +- + drivers/hv/Makefile | 2 +- + drivers/hv/channel_mgmt.c | 15 +- + drivers/hv/hv_fcopy.c | 427 ------ + drivers/hv/hv_util.c | 12 - + drivers/hv/hyperv_vmbus.h | 5 + + drivers/iio/accel/adxl345.h | 36 +- + drivers/iio/accel/adxl345_core.c | 92 +- + drivers/iio/accel/adxl345_i2c.c | 2 +- + drivers/iio/accel/adxl345_spi.c | 10 +- + drivers/iio/accel/adxl367.c | 2 +- + drivers/iio/accel/fxls8962af-core.c | 10 +- + drivers/iio/accel/mma8452.c | 6 +- + drivers/iio/adc/Kconfig | 27 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ab8500-gpadc.c | 8 +- + drivers/iio/adc/ad4130.c | 7 +- + drivers/iio/adc/ad7124.c | 55 +- + drivers/iio/adc/ad7173.c | 1180 +++++++++++++++++ + drivers/iio/adc/ad7192.c | 38 +- + drivers/iio/adc/ad7292.c | 13 +- + drivers/iio/adc/ad7944.c | 524 ++++++++ + drivers/iio/adc/ad_sigma_delta.c | 23 +- + drivers/iio/adc/adi-axi-adc.c | 20 +- + drivers/iio/adc/fsl-imx25-gcq.c | 140 +- + drivers/iio/adc/hx711.c | 5 +- + drivers/iio/adc/max11410.c | 27 +- + drivers/iio/adc/pac1934.c | 77 +- + drivers/iio/adc/qcom-spmi-adc5.c | 7 +- + drivers/iio/adc/rcar-gyroadc.c | 21 +- + drivers/iio/adc/rzg2l_adc.c | 11 +- + drivers/iio/adc/spear_adc.c | 25 +- + drivers/iio/adc/stm32-adc.c | 61 +- + drivers/iio/adc/ti-ads131e08.c | 12 +- + drivers/iio/adc/twl4030-madc.c | 19 +- + drivers/iio/addac/ad74413r.c | 10 +- + drivers/iio/buffer/industrialio-buffer-dma.c | 100 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 86 +- + drivers/iio/dac/Kconfig | 37 + + drivers/iio/dac/Makefile | 2 + + drivers/iio/dac/ad3552r.c | 110 +- + drivers/iio/dac/ad5755.c | 24 +- + drivers/iio/dac/ad5770r.c | 19 +- + drivers/iio/dac/ad9739a.c | 463 +++++++ + drivers/iio/dac/adi-axi-dac.c | 635 +++++++++ + drivers/iio/dac/ltc2688.c | 28 +- + drivers/iio/dac/ti-dac5571.c | 3 + + drivers/iio/frequency/admfm2000.c | 24 +- + drivers/iio/health/max30102.c | 2 + + drivers/iio/humidity/hdc3020.c | 111 +- + drivers/iio/humidity/hts221_core.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 2 + + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 5 + + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 3 + + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 3 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 542 +++++++- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 36 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 17 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 83 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- + drivers/iio/industrialio-backend.c | 179 +++ + drivers/iio/industrialio-buffer.c | 122 +- + drivers/iio/industrialio-core.c | 49 +- + drivers/iio/industrialio-trigger.c | 71 +- + drivers/iio/inkern.c | 263 ++-- + drivers/iio/light/Kconfig | 12 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/apds9306.c | 1361 ++++++++++++++++++++ + drivers/iio/light/st_uvis25_core.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 16 +- + drivers/iio/pressure/dps310.c | 138 +- + drivers/iio/pressure/hsc030pa_spi.c | 7 +- + drivers/iio/temperature/ltc2983.c | 142 +- + drivers/misc/Kconfig | 11 + + drivers/misc/Makefile | 1 + + drivers/misc/ds1682.c | 37 + + drivers/misc/mei/bus.c | 2 +- + drivers/misc/mei/hw.h | 2 - + drivers/misc/ntsync.c | 249 ++++ + drivers/misc/ti-st/st_kim.c | 4 +- + drivers/parport/parport_mfc3.c | 3 +- + drivers/peci/core.c | 4 +- + drivers/peci/device.c | 2 +- + drivers/peci/internal.h | 6 +- + drivers/uio/Kconfig | 18 - + drivers/uio/Makefile | 1 - + drivers/uio/uio.c | 24 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 6 +- + drivers/uio/uio_hv_generic.c | 19 +- + drivers/uio/uio_pdrv_genirq.c | 10 +- + drivers/uio/uio_pruss.c | 255 ---- + drivers/w1/masters/w1-gpio.c | 62 +- + include/linux/counter.h | 4 +- + include/linux/hyperv.h | 2 + + include/linux/iio/adc/ad_sigma_delta.h | 3 + + include/linux/iio/backend.h | 49 + + include/linux/iio/buffer-dma.h | 4 +- + include/linux/iio/buffer-dmaengine.h | 24 +- + include/linux/mfd/stm32-timers.h | 13 + + include/linux/platform_data/uio_pruss.h | 18 - + include/linux/property.h | 22 +- + include/uapi/linux/ntsync.h | 23 + + include/uapi/misc/pvpanic.h | 7 +- + tools/hv/Build | 3 +- + tools/hv/Makefile | 14 +- + tools/hv/hv_fcopy_daemon.c | 266 ---- + tools/hv/hv_fcopy_uio_daemon.c | 490 +++++++ + tools/hv/vmbus_bufring.c | 318 +++++ + tools/hv/vmbus_bufring.h | 158 +++ + tools/testing/nvdimm/test/ndtest.c | 5 +- + 142 files changed, 8959 insertions(+), 2462 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-ad9739a + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7173.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7944.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad9739a.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,axi-dac.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml + create mode 100644 Documentation/iio/ad7944.rst + delete mode 100644 drivers/hv/hv_fcopy.c + create mode 100644 drivers/iio/adc/ad7173.c + create mode 100644 drivers/iio/adc/ad7944.c + create mode 100644 drivers/iio/dac/ad9739a.c + create mode 100644 drivers/iio/dac/adi-axi-dac.c + create mode 100644 drivers/iio/light/apds9306.c + create mode 100644 drivers/misc/ntsync.c + delete mode 100644 drivers/uio/uio_pruss.c + delete mode 100644 include/linux/platform_data/uio_pruss.h + create mode 100644 include/uapi/linux/ntsync.h + delete mode 100644 tools/hv/hv_fcopy_daemon.c + create mode 100644 tools/hv/hv_fcopy_uio_daemon.c + create mode 100644 tools/hv/vmbus_bufring.c + create mode 100644 tools/hv/vmbus_bufring.h +Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage) +$ 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 (2d7e8a64a1e7 coresight: Docs/ABI/testing/sysfs-bus-coresight-devices: Fix spelling errors) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-etm3x | 2 +- + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 2 +- + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 2 +- + .../bindings/arm/qcom,coresight-tpda.yaml | 34 ++--- + drivers/acpi/arm64/amba.c | 8 -- + drivers/hwtracing/coresight/coresight-catu.c | 137 +++++++++++++++--- + drivers/hwtracing/coresight/coresight-catu.h | 1 + + drivers/hwtracing/coresight/coresight-core.c | 29 ++++ + drivers/hwtracing/coresight/coresight-cpu-debug.c | 137 +++++++++++++++--- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 29 ++-- + drivers/hwtracing/coresight/coresight-etm4x.h | 31 +---- + drivers/hwtracing/coresight/coresight-funnel.c | 87 ++++++------ + drivers/hwtracing/coresight/coresight-priv.h | 10 ++ + drivers/hwtracing/coresight/coresight-replicator.c | 82 ++++++----- + drivers/hwtracing/coresight/coresight-stm.c | 114 +++++++++++++-- + drivers/hwtracing/coresight/coresight-tmc-core.c | 153 ++++++++++++++++++--- + drivers/hwtracing/coresight/coresight-tmc.h | 2 + + drivers/hwtracing/coresight/coresight-tpiu.c | 120 +++++++++++++--- + include/linux/coresight.h | 6 + + 19 files changed, 756 insertions(+), 230 deletions(-) +Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + .../bindings/fpga/xlnx,fpga-selectmap.yaml | 86 ++++++++ + Documentation/driver-api/fpga/fpga-bridge.rst | 7 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 34 +-- + Documentation/driver-api/fpga/fpga-region.rst | 13 +- + drivers/fpga/Kconfig | 12 ++ + drivers/fpga/Makefile | 2 + + drivers/fpga/altera-cvp.c | 1 - + drivers/fpga/altera-ps-spi.c | 1 - + drivers/fpga/dfl-afu-main.c | 2 - + drivers/fpga/dfl-afu.h | 3 - + drivers/fpga/dfl-fme-main.c | 2 - + drivers/fpga/dfl-fme.h | 2 - + drivers/fpga/dfl.h | 5 - + drivers/fpga/fpga-bridge.c | 57 ++--- + drivers/fpga/fpga-mgr.c | 82 +++++--- + drivers/fpga/fpga-region.c | 24 ++- + drivers/fpga/ice40-spi.c | 4 +- + drivers/fpga/tests/fpga-bridge-test.c | 33 +-- + drivers/fpga/tests/fpga-mgr-test.c | 16 +- + drivers/fpga/tests/fpga-region-test.c | 41 ++-- + drivers/fpga/xilinx-core.c | 229 +++++++++++++++++++++ + drivers/fpga/xilinx-core.h | 27 +++ + drivers/fpga/xilinx-selectmap.c | 95 +++++++++ + drivers/fpga/xilinx-spi.c | 224 ++------------------ + include/linux/fpga/fpga-bridge.h | 10 +- + include/linux/fpga/fpga-mgr.h | 26 ++- + include/linux/fpga/fpga-region.h | 13 +- + 27 files changed, 676 insertions(+), 375 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,fpga-selectmap.yaml + create mode 100644 drivers/fpga/xilinx-core.c + create mode 100644 drivers/fpga/xilinx-core.h + create mode 100644 drivers/fpga/xilinx-selectmap.c +Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + drivers/interconnect/qcom/qcm2290.c | 2 +- + drivers/interconnect/qcom/sm6115.c | 33 ++++++++++++++++++--------------- + 2 files changed, 19 insertions(+), 16 deletions(-) +Merging iio/togreg (80721776c5af iio: adc: axi-adc: make sure AXI clock is enabled) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/iio/accel/mxc4005.c +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c +CONFLICT (content): Merge conflict in drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c +Recorded preimage for 'drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c'. +[master 323ad0f92555] Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 5 + + .../bindings/iio/imu/invensense,icm42600.yaml | 1 + + Documentation/iio/ad7944.rst | 30 +++- + Documentation/iio/adis16475.rst | 8 +- + drivers/iio/Makefile | 1 + + drivers/iio/accel/bmc150-accel-core.c | 44 +---- + drivers/iio/accel/kxcjk-1013.c | 80 +-------- + drivers/iio/accel/mxc4005.c | 22 +++ + drivers/iio/adc/ad7266.c | 1 - + drivers/iio/adc/ad7944.c | 186 +++++++++++++++++++-- + drivers/iio/adc/adi-axi-adc.c | 5 + + drivers/iio/adc/mxs-lradc-adc.c | 1 - + drivers/iio/adc/rtq6056.c | 34 ++-- + drivers/iio/dac/adi-axi-dac.c | 6 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 35 ++++ + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 75 ++++++--- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 15 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 21 +++ + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 84 +++++++--- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 3 + + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 3 + + drivers/iio/industrialio-acpi.c | 85 ++++++++++ + drivers/iio/industrialio-buffer.c | 2 +- + drivers/iio/light/apds9306.c | 12 +- + drivers/iio/light/stk3310.c | 1 - + include/linux/iio/iio.h | 13 ++ + 26 files changed, 555 insertions(+), 218 deletions(-) + create mode 100644 drivers/iio/industrialio-acpi.c +Merging phy-next/next (9c79b779643e phy: rockchip: fix CONFIG_TYPEC dependency) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging MAINTAINERS +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp-combo.c +Auto-merging drivers/phy/rockchip/Kconfig +Merge made by the 'ort' strategy. + .../bindings/phy/fsl,imx8mp-hdmi-phy.yaml | 62 + + .../bindings/phy/mediatek,mt7988-xfi-tphy.yaml | 80 + + .../bindings/phy/phy-rockchip-usbdp.yaml | 148 ++ + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 1 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 27 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 3 + + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 4 +- + .../bindings/phy/rockchip,pcie3-phy.yaml | 10 + + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 1 + + MAINTAINERS | 2 + + drivers/phy/freescale/Kconfig | 6 + + drivers/phy/freescale/Makefile | 1 + + drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 718 +++++++++ + drivers/phy/mediatek/Kconfig | 11 + + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-xfi-tphy.c | 451 ++++++ + drivers/phy/phy-core.c | 26 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 369 ++++- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 17 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 56 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 100 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h | 4 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h | 6 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 144 +- + drivers/phy/rockchip/Kconfig | 12 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 4 +- + drivers/phy/rockchip/phy-rockchip-snps-pcie3.c | 49 +- + drivers/phy/rockchip/phy-rockchip-usbdp.c | 1608 ++++++++++++++++++++ + drivers/phy/samsung/Makefile | 1 + + drivers/phy/samsung/phy-exynos7-ufs.c | 1 + + drivers/phy/samsung/phy-exynosautov9-ufs.c | 1 + + drivers/phy/samsung/phy-fsd-ufs.c | 1 + + drivers/phy/samsung/phy-gs101-ufs.c | 182 +++ + drivers/phy/samsung/phy-samsung-ufs.c | 21 +- + drivers/phy/samsung/phy-samsung-ufs.h | 6 + + drivers/phy/xilinx/phy-zynqmp.c | 6 +- + include/dt-bindings/phy/phy-qcom-qmp.h | 4 + + 38 files changed, 4021 insertions(+), 124 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mp-hdmi-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,mt7988-xfi-tphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml + create mode 100644 drivers/phy/freescale/phy-fsl-samsung-hdmi.c + create mode 100644 drivers/phy/mediatek/phy-mtk-xfi-tphy.c + create mode 100644 drivers/phy/rockchip/phy-rockchip-usbdp.c + create mode 100644 drivers/phy/samsung/phy-gs101-ufs.c +Merging soundwire/next (a36ec5f7625d soundwire: intel_ace2x: simplify check_wake()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/amd_manager.c +Auto-merging sound/soc/sof/intel/hda.c +Merge made by the 'ort' strategy. + drivers/soundwire/amd_init.c | 36 +++++------- + drivers/soundwire/amd_init.h | 8 +++ + drivers/soundwire/amd_manager.c | 13 ++-- + drivers/soundwire/bus.c | 14 ++--- + drivers/soundwire/bus_type.c | 5 +- + drivers/soundwire/cadence_master.c | 36 +++++------- + drivers/soundwire/intel.c | 68 +++++++++++++++++++-- + drivers/soundwire/intel_ace2x.c | 101 ++++++++++++++++++++++---------- + drivers/soundwire/intel_auxdevice.c | 10 ++-- + drivers/soundwire/intel_auxdevice.h | 1 + + drivers/soundwire/intel_init.c | 14 +++++ + drivers/soundwire/qcom.c | 28 +++++++-- + drivers/soundwire/sysfs_local.h | 4 +- + drivers/soundwire/sysfs_slave.c | 66 ++++++++++----------- + drivers/soundwire/sysfs_slave_dpn.c | 3 + + include/linux/soundwire/sdw.h | 17 +----- + include/linux/soundwire/sdw_intel.h | 11 +++- + include/linux/soundwire/sdw_registers.h | 2 +- + sound/soc/sof/intel/hda.c | 4 +- + 19 files changed, 282 insertions(+), 159 deletions(-) +Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + drivers/extcon/Kconfig | 3 ++- + drivers/extcon/extcon-adc-jack.c | 6 ++---- + drivers/extcon/extcon-intel-cht-wc.c | 6 ++---- + drivers/extcon/extcon-intel-mrfld.c | 26 +++++++++----------------- + drivers/extcon/extcon-max3355.c | 6 ++---- + drivers/extcon/extcon-max77843.c | 6 ++---- + drivers/extcon/extcon-rtk-type-c.c | 1 - + drivers/extcon/extcon-usb-gpio.c | 6 ++---- + drivers/extcon/extcon-usbc-cros-ec.c | 6 ++---- + 9 files changed, 23 insertions(+), 43 deletions(-) +Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-rc4) +$ 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 (848e447e000c vfio/cdx: add interrupt support) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging MAINTAINERS +Auto-merging include/linux/msi.h +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + drivers/vfio/cdx/Makefile | 2 +- + drivers/vfio/cdx/intr.c | 217 ++++++++++++++++++++++++++++++++++++++ + drivers/vfio/cdx/main.c | 63 ++++++++++- + drivers/vfio/cdx/private.h | 18 ++++ + drivers/vfio/pci/vfio_pci_intrs.c | 61 +++++------ + include/linux/msi.h | 6 ++ + kernel/irq/msi.c | 2 + + 8 files changed, 334 insertions(+), 38 deletions(-) + create mode 100644 drivers/vfio/cdx/intr.c +Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (ee2098c0b512 spmi: pmic-arb: Add multi bus support) +$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Merge made by the 'ort' strategy. + .../spmi/hisilicon,hisi-spmi-controller.yaml | 17 +- + .../bindings/spmi/qcom,spmi-pmic-arb.yaml | 1 + + .../bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml | 136 +++ + drivers/spmi/hisi-spmi-controller.c | 1 - + drivers/spmi/spmi-pmic-arb.c | 980 +++++++++++++-------- + drivers/spmi/spmi.c | 2 +- + 6 files changed, 744 insertions(+), 393 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml +Merging staging/staging-next (75ff53c44f5e staging: vc04_services: Drop completed TODO item) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/axis-fifo/axis-fifo.c | 10 +- + drivers/staging/greybus/arche-apb-ctrl.c | 1 + + drivers/staging/greybus/arche-platform.c | 9 +- + drivers/staging/greybus/audio_manager_module.c | 2 +- + drivers/staging/greybus/camera.c | 58 +- + drivers/staging/greybus/fw-management.c | 12 +- + drivers/staging/greybus/light.c | 8 +- + drivers/staging/greybus/loopback.c | 1 + + drivers/staging/ks7010/ks7010_sdio.c | 2 +- + drivers/staging/nvec/TODO | 1 - + drivers/staging/nvec/nvec.c | 11 +- + drivers/staging/nvec/nvec_kbd.c | 9 +- + drivers/staging/nvec/nvec_ps2.c | 31 +- + drivers/staging/pi433/pi433_if.c | 697 ++-- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 11 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 24 +- + drivers/staging/rtl8192e/rtllib.h | 20 +- + drivers/staging/rtl8712/mlme_linux.c | 18 +- + drivers/staging/rtl8712/os_intfs.c | 3 +- + drivers/staging/rtl8712/rtl8712_led.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 6 +- + drivers/staging/rtl8712/rtl8712_recv.h | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 92 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 5 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- + drivers/staging/rts5208/rtsx_scsi.c | 10 +- + drivers/staging/vc04_services/Kconfig | 36 +- + drivers/staging/vc04_services/Makefile | 1 - + .../staging/vc04_services/bcm2835-audio/Kconfig | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 5 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 4 +- + .../include/linux/raspberrypi/vchiq.h | 4 +- + drivers/staging/vc04_services/interface/TODO | 15 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 263 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 41 +- + .../vc04_services/interface/vchiq_arm/vchiq_bus.c | 13 + + .../vc04_services/interface/vchiq_arm/vchiq_bus.h | 3 + + .../interface/vchiq_arm/vchiq_connected.c | 74 - + .../interface/vchiq_arm/vchiq_connected.h | 12 - + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 51 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 17 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 5 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 34 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 14 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.h | 32 +- + drivers/staging/vt6655/rf.h | 4 - + drivers/staging/vt6655/srom.c | 1 - + drivers/staging/wlan-ng/Kconfig | 13 - + drivers/staging/wlan-ng/Makefile | 8 - + drivers/staging/wlan-ng/README | 8 - + drivers/staging/wlan-ng/TODO | 16 - + drivers/staging/wlan-ng/cfg80211.c | 718 ---- + drivers/staging/wlan-ng/hfa384x.h | 1236 ------- + drivers/staging/wlan-ng/hfa384x_usb.c | 3880 -------------------- + drivers/staging/wlan-ng/p80211conv.c | 643 ---- + drivers/staging/wlan-ng/p80211conv.h | 141 - + drivers/staging/wlan-ng/p80211hdr.h | 189 - + drivers/staging/wlan-ng/p80211ioctl.h | 69 - + drivers/staging/wlan-ng/p80211metadef.h | 227 -- + drivers/staging/wlan-ng/p80211metastruct.h | 236 -- + drivers/staging/wlan-ng/p80211mgmt.h | 199 - + drivers/staging/wlan-ng/p80211msg.h | 39 - + drivers/staging/wlan-ng/p80211netdev.c | 988 ----- + drivers/staging/wlan-ng/p80211netdev.h | 212 -- + drivers/staging/wlan-ng/p80211req.c | 223 -- + drivers/staging/wlan-ng/p80211req.h | 33 - + drivers/staging/wlan-ng/p80211types.h | 292 -- + drivers/staging/wlan-ng/p80211wep.c | 207 -- + drivers/staging/wlan-ng/prism2fw.c | 1213 ------ + drivers/staging/wlan-ng/prism2mgmt.c | 1315 ------- + drivers/staging/wlan-ng/prism2mgmt.h | 89 - + drivers/staging/wlan-ng/prism2mib.c | 742 ---- + drivers/staging/wlan-ng/prism2sta.c | 1945 ---------- + drivers/staging/wlan-ng/prism2usb.c | 299 -- + 81 files changed, 802 insertions(+), 16093 deletions(-) + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.h + delete mode 100644 drivers/staging/wlan-ng/Kconfig + delete mode 100644 drivers/staging/wlan-ng/Makefile + delete mode 100644 drivers/staging/wlan-ng/README + delete mode 100644 drivers/staging/wlan-ng/TODO + delete mode 100644 drivers/staging/wlan-ng/cfg80211.c + delete mode 100644 drivers/staging/wlan-ng/hfa384x.h + delete mode 100644 drivers/staging/wlan-ng/hfa384x_usb.c + delete mode 100644 drivers/staging/wlan-ng/p80211conv.c + delete mode 100644 drivers/staging/wlan-ng/p80211conv.h + delete mode 100644 drivers/staging/wlan-ng/p80211hdr.h + delete mode 100644 drivers/staging/wlan-ng/p80211ioctl.h + delete mode 100644 drivers/staging/wlan-ng/p80211metadef.h + delete mode 100644 drivers/staging/wlan-ng/p80211metastruct.h + delete mode 100644 drivers/staging/wlan-ng/p80211mgmt.h + delete mode 100644 drivers/staging/wlan-ng/p80211msg.h + delete mode 100644 drivers/staging/wlan-ng/p80211netdev.c + delete mode 100644 drivers/staging/wlan-ng/p80211netdev.h + delete mode 100644 drivers/staging/wlan-ng/p80211req.c + delete mode 100644 drivers/staging/wlan-ng/p80211req.h + delete mode 100644 drivers/staging/wlan-ng/p80211types.h + delete mode 100644 drivers/staging/wlan-ng/p80211wep.c + delete mode 100644 drivers/staging/wlan-ng/prism2fw.c + delete mode 100644 drivers/staging/wlan-ng/prism2mgmt.c + delete mode 100644 drivers/staging/wlan-ng/prism2mgmt.h + delete mode 100644 drivers/staging/wlan-ng/prism2mib.c + delete mode 100644 drivers/staging/wlan-ng/prism2sta.c + delete mode 100644 drivers/staging/wlan-ng/prism2usb.c +Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Merge made by the 'ort' strategy. + include/linux/counter.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) +$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next +Already up to date. +Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (700b2e1eccb4 dmaengine: xilinx: xdma: fix module autoloading) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/idma64.c +Auto-merging drivers/dma/idxd/cdev.c +Auto-merging drivers/dma/xilinx/xdma.c +Auto-merging drivers/dma/xilinx/xilinx_dpdma.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/fsl,edma.yaml | 139 ++++++++++++++------- + .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 1 + + .../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 95 -------------- + .../bindings/dma/snps,dma-spear1340.yaml | 42 +++---- + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 1 + + MAINTAINERS | 1 - + drivers/dma/amba-pl08x.c | 4 +- + drivers/dma/dma-axi-dmac.c | 78 +++++------- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 38 ++++-- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 3 +- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 14 +-- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.h | 5 +- + drivers/dma/fsl-dpaa2-qdma/dpdmai.c | 113 +++++++---------- + drivers/dma/fsl-dpaa2-qdma/dpdmai.h | 61 +++++---- + drivers/dma/fsl-edma-common.c | 23 ++-- + drivers/dma/fsl-edma-common.h | 4 - + drivers/dma/fsl-edma-main.c | 50 +++++--- + drivers/dma/idma64.c | 4 +- + drivers/dma/idxd/cdev.c | 17 +-- + drivers/dma/imx-sdma.c | 97 +++++++++++--- + drivers/dma/mcf-edma-main.c | 4 +- + drivers/dma/pch_dma.c | 5 - + drivers/dma/qcom/hidma.c | 11 -- + drivers/dma/qcom/hidma_mgmt.c | 109 +--------------- + drivers/dma/virt-dma.h | 10 ++ + drivers/dma/xilinx/xdma.c | 1 + + drivers/dma/xilinx/xilinx_dpdma.c | 10 +- + include/linux/dma/imx-dma.h | 1 + + 28 files changed, 419 insertions(+), 522 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt +Merging cgroup/for-next (b7d56d953a67 cgroup/cpuset: Remove outdated comment in sched_partition_write()) +$ 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 Documentation/admin-guide/cgroup-v2.rst +Auto-merging kernel/cpu.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/cgroups.rst | 2 +- + Documentation/admin-guide/cgroup-v2.rst | 31 +++- + include/linux/cgroup.h | 2 +- + include/linux/cpuset.h | 3 - + include/trace/events/cgroup.h | 48 +++++++ + kernel/cgroup/cgroup-v1.c | 1 + + kernel/cgroup/cgroup.c | 3 +- + kernel/cgroup/cpuset.c | 156 ++++++++------------- + kernel/cgroup/legacy_freezer.c | 5 +- + kernel/cgroup/pids.c | 2 - + kernel/cgroup/rstat.c | 48 +++++-- + kernel/cpu.c | 48 ------- + kernel/power/process.c | 2 - + tools/testing/selftests/cgroup/Makefile | 2 +- + tools/testing/selftests/cgroup/cgroup_util.c | 8 +- + tools/testing/selftests/cgroup/cgroup_util.h | 2 +- + tools/testing/selftests/cgroup/test_core.c | 7 +- + tools/testing/selftests/cgroup/test_cpu.c | 2 +- + tools/testing/selftests/cgroup/test_cpuset.c | 2 +- + .../testing/selftests/cgroup/test_cpuset_v1_hp.sh | 46 ++++++ + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + .../testing/selftests/cgroup/test_hugetlb_memcg.c | 2 +- + tools/testing/selftests/cgroup/test_kill.c | 2 +- + tools/testing/selftests/cgroup/test_kmem.c | 2 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 2 +- + tools/testing/selftests/cgroup/test_zswap.c | 2 +- + 26 files changed, 245 insertions(+), 187 deletions(-) + create mode 100755 tools/testing/selftests/cgroup/test_cpuset_v1_hp.sh +Merging scsi/for-next (8c5220c43ba0 Merge branch 'fixes' 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 MAINTAINERS +Auto-merging block/blk-settings.c +CONFLICT (content): Merge conflict in block/blk-settings.c +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/libata.h +Auto-merging drivers/ata/pata_macio.c +Auto-merging drivers/ata/sata_mv.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/usb/storage/uas.c +Auto-merging include/linux/blkdev.h +CONFLICT (content): Merge conflict in include/linux/blkdev.h +Resolved 'block/blk-settings.c' using previous resolution. +Resolved 'include/linux/blkdev.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 31f5a42a86f3] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/scsi.rst | 15 +- + Documentation/scsi/scsi_mid_low_api.rst | 20 +- + MAINTAINERS | 3 +- + block/blk-settings.c | 245 ------------------ + block/bsg-lib.c | 6 +- + drivers/ata/ahci.h | 2 +- + drivers/ata/libata-sata.c | 187 ++++++++++---- + drivers/ata/libata-scsi.c | 19 +- + drivers/ata/libata.h | 3 +- + drivers/ata/pata_macio.c | 11 +- + drivers/ata/sata_mv.c | 2 +- + drivers/ata/sata_nv.c | 24 +- + drivers/ata/sata_sil24.c | 2 +- + drivers/firewire/sbp2.c | 13 +- + drivers/message/fusion/mptfc.c | 1 + + drivers/message/fusion/mptsas.c | 1 + + drivers/message/fusion/mptscsih.c | 2 - + drivers/message/fusion/mptspi.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- + drivers/s390/block/dasd_eckd.c | 6 +- + drivers/scsi/FlashPoint.c | 1 - + drivers/scsi/Kconfig | 4 +- + drivers/scsi/a3000.c | 8 +- + drivers/scsi/a4000t.c | 8 +- + drivers/scsi/aha152x.c | 8 +- + drivers/scsi/aic7xxx/Kconfig.aic79xx | 75 +++--- + drivers/scsi/aic7xxx/Kconfig.aic7xxx | 97 ++++---- + drivers/scsi/aic94xx/aic94xx_init.c | 29 +-- + drivers/scsi/atari_scsi.c | 8 +- + drivers/scsi/csiostor/csio_init.c | 3 - + drivers/scsi/cxlflash/lunmgt.c | 6 +- + drivers/scsi/cxlflash/main.c | 18 +- + drivers/scsi/cxlflash/superpipe.c | 40 ++- + drivers/scsi/cxlflash/superpipe.h | 11 +- + drivers/scsi/cxlflash/vlun.c | 9 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 20 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 26 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 31 +-- + drivers/scsi/hosts.c | 6 + + drivers/scsi/hptiop.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 5 +- + drivers/scsi/imm.c | 12 +- + drivers/scsi/ipr.c | 10 +- + drivers/scsi/isci/init.c | 29 +-- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 84 +++++++ + drivers/scsi/libsas/sas_scsi_host.c | 7 +- + drivers/scsi/mac_scsi.c | 8 +- + drivers/scsi/megaraid/Kconfig.megaraid | 113 +++++---- + drivers/scsi/megaraid/megaraid_sas.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 29 ++- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 3 + + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 20 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 20 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr.h | 15 +- + drivers/scsi/mpi3mr/mpi3mr_app.c | 33 +-- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 42 ++-- + drivers/scsi/mpi3mr/mpi3mr_os.c | 86 +++---- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 18 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 18 +- + drivers/scsi/mvsas/mv_init.c | 26 +- + drivers/scsi/pm8001/pm8001_ctl.c | 5 + + drivers/scsi/pm8001/pm8001_init.c | 21 +- + drivers/scsi/pm8001/pm8001_sas.h | 1 + + drivers/scsi/pmcraid.c | 11 +- + drivers/scsi/ppa.c | 8 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qla2xxx/Kconfig | 42 ++-- + drivers/scsi/qla2xxx/qla_os.c | 9 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 17 +- + drivers/scsi/qla4xxx/ql4_os.c | 14 +- + drivers/scsi/scsi_debugfs.c | 56 +++-- + drivers/scsi/scsi_devinfo.c | 18 +- + drivers/scsi/scsi_lib.c | 42 ++-- + drivers/scsi/scsi_scan.c | 74 +++--- + drivers/scsi/scsi_sysfs.c | 5 +- + drivers/scsi/scsi_transport_fc.c | 15 +- + drivers/scsi/scsi_transport_iscsi.c | 6 +- + drivers/scsi/scsi_transport_sas.c | 4 +- + drivers/scsi/sd.c | 1 - + drivers/scsi/ses.c | 1 - + drivers/scsi/smartpqi/smartpqi_init.c | 5 +- + drivers/scsi/snic/snic_attrs.c | 11 +- + drivers/scsi/sr.c | 1 - + drivers/scsi/st.c | 1 - + drivers/scsi/wd33c93.c | 4 +- + drivers/staging/rts5208/rtsx.c | 24 +- + drivers/ufs/core/ufs_bsg.c | 3 +- + drivers/ufs/core/ufshcd.c | 370 +++++++--------------------- + drivers/ufs/host/cdns-pltfrm.c | 2 +- + drivers/ufs/host/ufs-exynos.c | 9 +- + drivers/ufs/host/ufs-mediatek-sip.h | 94 +++++++ + drivers/ufs/host/ufs-mediatek.c | 131 ++++++++-- + drivers/ufs/host/ufs-mediatek.h | 90 +------ + drivers/ufs/host/ufs-qcom.c | 25 +- + drivers/ufs/host/ufs-qcom.h | 12 +- + drivers/usb/image/microtek.c | 8 +- + drivers/usb/storage/scsiglue.c | 57 ++--- + drivers/usb/storage/uas.c | 29 ++- + drivers/usb/storage/usb.c | 10 + + include/linux/blkdev.h | 27 +- + include/linux/bsg-lib.h | 3 +- + include/linux/libata.h | 16 +- + include/linux/mmc/host.h | 4 +- + include/scsi/iser.h | 2 +- + include/scsi/libfcoe.h | 25 +- + include/scsi/libsas.h | 32 ++- + include/scsi/sas_ata.h | 6 + + include/scsi/scsi.h | 7 +- + include/scsi/scsi_cmnd.h | 2 + + include/scsi/scsi_driver.h | 4 +- + include/scsi/scsi_host.h | 9 + + include/scsi/scsi_transport.h | 2 +- + include/scsi/scsi_transport_fc.h | 6 +- + include/scsi/scsi_transport_srp.h | 4 +- + include/ufs/ufshcd.h | 3 - + include/ufs/ufshci.h | 13 +- + 122 files changed, 1424 insertions(+), 1559 deletions(-) + create mode 100644 drivers/ufs/host/ufs-mediatek-sip.h +Merging scsi-mkp/for-next (aca061774bc4 scsi: mpi3mr: Fix some kernel-doc warnings in scsi_bsg_mpi3mr.h) +$ 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 drivers/scsi/bnx2fc/bnx2fc_tgt.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/libsas/sas_expander.c +Auto-merging include/uapi/scsi/scsi_bsg_mpi3mr.h +Merge made by the 'ort' strategy. + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 4 +--- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/libsas/sas_expander.c | 38 +++++++++++++++++++++++++++++-------- + drivers/scsi/libsas/sas_internal.h | 15 --------------- + drivers/scsi/qedf/qedf_io.c | 6 +++--- + drivers/scsi/qedi/qedi_debugfs.c | 12 ++++-------- + drivers/ufs/core/ufs-mcq.c | 3 +-- + include/scsi/libfc.h | 18 +++++++++++++++--- + include/scsi/scsi.h | 5 +++-- + include/uapi/scsi/scsi_bsg_mpi3mr.h | 8 +++++--- + include/uapi/scsi/scsi_bsg_ufs.h | 4 +++- + 11 files changed, 66 insertions(+), 49 deletions(-) +Merging vhost/linux-next (24ddee0ff8c3 Merge tag 'stable/vduse-virtio-net' into vhost) +$ 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 MAINTAINERS +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/iommu/virtio-iommu.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/wireless/virtual/mac80211_hwsim.c +Auto-merging drivers/virtio/virtio_mem.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c +Auto-merging include/linux/virtio.h +Resolved 'drivers/virtio/virtio_mem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7751bac6fe68] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 +- + arch/um/drivers/virt-pci.c | 1 - + drivers/block/virtio_blk.c | 1 - + drivers/bluetooth/virtio_bt.c | 1 - + drivers/char/hw_random/virtio-rng.c | 1 - + drivers/char/virtio_console.c | 2 - + drivers/crypto/virtio/virtio_crypto_core.c | 1 - + drivers/firmware/arm_scmi/virtio.c | 1 - + drivers/gpio/gpio-virtio.c | 1 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - + drivers/iommu/virtio-iommu.c | 1 - + drivers/misc/nsm.c | 1 - + drivers/net/caif/caif_virtio.c | 1 - + drivers/net/virtio_net.c | 248 +++++++++++++++++--------- + drivers/net/wireless/virtual/mac80211_hwsim.c | 1 - + drivers/nvdimm/virtio_pmem.c | 1 - + drivers/rpmsg/virtio_rpmsg_bus.c | 1 - + drivers/scsi/virtio_scsi.c | 1 - + drivers/vdpa/vdpa.c | 2 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 24 ++- + drivers/vdpa/virtio_pci/vp_vdpa.c | 27 ++- + drivers/vhost/scsi.c | 70 +++++--- + drivers/vhost/vdpa.c | 6 +- + drivers/vhost/vhost.c | 130 ++++++++++---- + drivers/vhost/vhost.h | 3 +- + drivers/virtio/virtio_balloon.c | 85 +++++---- + drivers/virtio/virtio_input.c | 1 - + drivers/virtio/virtio_mem.c | 69 ++++++- + drivers/virtio/virtio_mmio.c | 6 +- + drivers/virtio/virtio_ring.c | 59 +++++- + fs/coredump.c | 4 +- + fs/fuse/virtio_fs.c | 1 - + include/linux/sched/vhost_task.h | 3 +- + include/linux/virtio.h | 7 + + include/uapi/linux/virtio_mem.h | 2 + + kernel/exit.c | 5 +- + kernel/signal.c | 4 +- + kernel/vhost_task.c | 53 ++++-- + net/9p/trans_virtio.c | 1 - + net/vmw_vsock/virtio_transport.c | 1 - + sound/virtio/virtio_card.c | 1 - + 41 files changed, 571 insertions(+), 264 deletions(-) +Merging rpmsg/for-next (87f678f813d9 Merge branches 'rproc-next' and 'rpmsg-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 +Merge made by the 'ort' strategy. + .../bindings/remoteproc/xlnx,zynqmp-r5fss.yaml | 277 +++++++++++++++-- + drivers/remoteproc/mtk_scp.c | 10 +- + drivers/remoteproc/remoteproc_internal.h | 2 +- + drivers/remoteproc/remoteproc_sysfs.c | 2 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 329 ++++++++++----------- + drivers/rpmsg/rpmsg_char.c | 2 +- + drivers/rpmsg/rpmsg_core.c | 16 +- + drivers/rpmsg/rpmsg_ctrl.c | 2 +- + drivers/rpmsg/rpmsg_internal.h | 2 +- + 9 files changed, 433 insertions(+), 209 deletions(-) +Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-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 (5539287ca656 gpio: brcmstb: add support for gpio-ranges) +$ 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 +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + .../bindings/gpio/brcm,brcmstb-gpio.yaml | 3 ++ + .../bindings/gpio/microchip,mpfs-gpio.yaml | 17 ++++++-- + Documentation/driver-api/gpio/driver.rst | 28 ++++++------- + Documentation/driver-api/gpio/legacy.rst | 16 ------- + .../translations/zh_CN/driver-api/gpio/legacy.rst | 16 ------- + Documentation/translations/zh_TW/gpio.txt | 17 -------- + .../userspace-api/gpio/gpio-v2-get-line-ioctl.rst | 2 +- + arch/arm/mach-pxa/spitz_pm.c | 22 +++++----- + arch/arm/mach-sa1100/h3600.c | 47 ++++++++++++++++----- + drivers/gpio/gpio-brcmstb.c | 21 +++++----- + drivers/gpio/gpio-cros-ec.c | 8 ++++ + drivers/gpio/gpio-pcie-idio-24.c | 2 +- + drivers/gpio/gpio-regmap.c | 4 +- + drivers/gpio/gpiolib-legacy.c | 49 +++------------------- + drivers/gpio/gpiolib-of.c | 23 +++++++++- + drivers/gpio/gpiolib-sysfs.c | 2 +- + drivers/gpio/gpiolib.c | 26 ++++++------ + drivers/gpio/gpiolib.h | 2 +- + include/linux/gpio.h | 21 +++------- + 19 files changed, 149 insertions(+), 177 deletions(-) +Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +Auto-merging include/linux/acpi.h +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/gpio/Kconfig | 18 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-graniterapids.c | 383 +++++++++++++++++++++ + drivers/gpio/gpio-pca953x.c | 2 +- + drivers/gpio/gpio-sch.c | 35 +- + drivers/gpio/gpiolib-acpi.c | 65 ++-- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 2 +- + include/linux/acpi.h | 8 +- + 10 files changed, 468 insertions(+), 49 deletions(-) + create mode 100644 drivers/gpio/gpio-graniterapids.c +Merging pinctrl/for-next (f3953d6d4f60 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 +Merge made by the 'ort' strategy. + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 3 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 38 ++++++ + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 1 + + .../bindings/pinctrl/qcom,sm4450-tlmm.yaml | 52 +++----- + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +++--- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 64 +++++++++- + drivers/pinctrl/core.c | 8 +- + drivers/pinctrl/devicetree.c | 10 +- + drivers/pinctrl/freescale/pinctrl-imx8ulp.c | 1 + + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 1 + + drivers/pinctrl/mediatek/pinctrl-mt6779.c | 1 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 40 ++----- + drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 3 - + drivers/pinctrl/pinconf-generic.c | 2 +- + drivers/pinctrl/pinctrl-aw9523.c | 131 ++++++++------------- + drivers/pinctrl/pinctrl-loongson2.c | 1 + + drivers/pinctrl/pinctrl-max77620.c | 2 - + drivers/pinctrl/pinctrl-single.c | 50 ++++---- + drivers/pinctrl/pinmux.c | 26 ++-- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 55 ++++----- + drivers/pinctrl/pxa/pinctrl-pxa2xx.h | 15 +-- + drivers/pinctrl/qcom/pinctrl-sm7150.c | 1 + + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 4 + + drivers/pinctrl/realtek/pinctrl-rtd1315e.c | 1 + + drivers/pinctrl/realtek/pinctrl-rtd1319d.c | 1 + + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 14 ++- + drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 1 - + 29 files changed, 291 insertions(+), 277 deletions(-) +Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3) +$ 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 (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces) +$ 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 +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pfc-r8a779h0.c | 136 +++++++++++++++++++++++++++++--- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 +- + 2 files changed, 127 insertions(+), 13 deletions(-) +Merging pinctrl-samsung/for-next (f9c744747973 pinctrl: samsung: support a bus clock) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/pinctrl/samsung,pinctrl.yaml | 21 ++++ + MAINTAINERS | 1 - + drivers/pinctrl/samsung/pinctrl-exynos.c | 112 +++++++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 97 +++++++++++++++++- + drivers/pinctrl/samsung/pinctrl-samsung.h | 2 + + include/dt-bindings/pinctrl/samsung.h | 95 ----------------- + 6 files changed, 228 insertions(+), 100 deletions(-) + delete mode 100644 include/dt-bindings/pinctrl/samsung.h +Merging pwm/pwm/for-next (6144744bb9a8 pwm: meson: Use mul_u64_u64_div_u64() for frequency calculating) +$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Auto-merging drivers/hwmon/aspeed-g6-pwm-tach.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/atmel,at91sam-pwm.yaml | 3 + + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 1 + + drivers/hwmon/aspeed-g6-pwm-tach.c | 21 +- + drivers/pwm/Kconfig | 4 - + drivers/pwm/Makefile | 1 - + drivers/pwm/core.c | 604 +++++++++++++++++++-- + drivers/pwm/pwm-bcm2835.c | 30 +- + drivers/pwm/pwm-meson.c | 213 +++++--- + drivers/pwm/pwm-sti.c | 161 ++---- + drivers/pwm/pwm-stm32.c | 60 +- + drivers/pwm/sysfs.c | 545 ------------------- + include/linux/pwm.h | 36 +- + 12 files changed, 828 insertions(+), 851 deletions(-) + delete mode 100644 drivers/pwm/sysfs.c +Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) +$ 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 (693fe2f6a9ea selftests: kselftest: Make ksft_exit functions return void instead of int) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/kselftest.h +Auto-merging tools/testing/selftests/mm/ksm_functional_tests.c +Auto-merging tools/testing/selftests/mm/soft-dirty.c +CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c +Auto-merging tools/testing/selftests/x86/lam.c +Resolved 'tools/testing/selftests/mm/soft-dirty.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9856febe4bc7] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + tools/testing/selftests/clone3/clone3.c | 7 +- + .../selftests/clone3/clone3_clear_sighand.c | 2 +- + tools/testing/selftests/clone3/clone3_set_tid.c | 121 ++-- + tools/testing/selftests/cpufreq/cpufreq.sh | 3 +- + tools/testing/selftests/cpufreq/main.sh | 47 +- + tools/testing/selftests/cpufreq/module.sh | 6 +- + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 253 +++----- + tools/testing/selftests/exec/recursion-depth.c | 10 +- + tools/testing/selftests/ftrace/ftracetest | 8 +- + tools/testing/selftests/ftrace/ftracetest-ktap | 2 +- + tools/testing/selftests/ipc/msgque.c | 11 +- + tools/testing/selftests/kselftest.h | 49 +- + tools/testing/selftests/kselftest/ktap_helpers.sh | 4 +- + .../membarrier/membarrier_test_multi_thread.c | 2 +- + .../membarrier/membarrier_test_single_thread.c | 2 +- + tools/testing/selftests/mm/compaction_test.c | 6 +- + tools/testing/selftests/mm/cow.c | 2 +- + tools/testing/selftests/mm/gup_longterm.c | 2 +- + tools/testing/selftests/mm/gup_test.c | 4 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 2 +- + tools/testing/selftests/mm/madv_populate.c | 2 +- + tools/testing/selftests/mm/mkdirty.c | 2 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 4 +- + tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_open_test.c | 4 +- + tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_test.c | 2 +- + .../power_supply/test_power_supply_properties.sh | 2 +- + tools/testing/selftests/resctrl/cat_test.c | 8 +- + tools/testing/selftests/resctrl/cmt_test.c | 4 +- + tools/testing/selftests/resctrl/mba_test.c | 8 +- + tools/testing/selftests/resctrl/mbm_test.c | 8 +- + tools/testing/selftests/resctrl/resctrl.h | 9 +- + tools/testing/selftests/resctrl/resctrl_tests.c | 26 +- + tools/testing/selftests/resctrl/resctrl_val.c | 8 +- + tools/testing/selftests/sync/sync_test.c | 3 +- + tools/testing/selftests/timers/adjtick.c | 4 +- + .../testing/selftests/timers/alarmtimer-suspend.c | 4 +- + tools/testing/selftests/timers/change_skew.c | 4 +- + tools/testing/selftests/timers/freq-step.c | 4 +- + tools/testing/selftests/timers/leap-a-day.c | 10 +- + tools/testing/selftests/timers/leapcrash.c | 4 +- + tools/testing/selftests/timers/mqueue-lat.c | 4 +- + tools/testing/selftests/timers/posix_timers.c | 12 +- + tools/testing/selftests/timers/raw_skew.c | 6 +- + tools/testing/selftests/timers/set-2038.c | 4 +- + tools/testing/selftests/timers/set-tai.c | 4 +- + tools/testing/selftests/timers/set-timer-lat.c | 4 +- + tools/testing/selftests/timers/set-tz.c | 4 +- + tools/testing/selftests/timers/skew_consistency.c | 4 +- + tools/testing/selftests/timers/threadtest.c | 2 +- + tools/testing/selftests/timers/valid-adjtimex.c | 6 +- + tools/testing/selftests/tty/tty_tstamp_update.c | 48 +- + tools/testing/selftests/x86/lam.c | 2 +- + tools/testing/selftests/x86/test_mremap_vdso.c | 43 +- + tools/testing/selftests/x86/test_vsyscall.c | 702 ++++++++++----------- + 56 files changed, 760 insertions(+), 752 deletions(-) +Merging kunit/test (4cece7649650 Linux 6.9-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 (aa892c2e7919 kunit: string-stream-test: use KUNIT_DEFINE_ACTION_WRAPPER) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + include/kunit/test.h | 24 +++++++++++++++++++--- + include/kunit/try-catch.h | 3 --- + kernel/kthread.c | 1 + + lib/kunit/Kconfig | 11 +++++++++++ + lib/kunit/device.c | 2 +- + lib/kunit/kunit-test.c | 45 +++++++++++++++++++++++++++++++++++++++++- + lib/kunit/string-stream-test.c | 12 ++--------- + lib/kunit/try-catch.c | 40 ++++++++++++++++++++++++++----------- + lib/kunit_iov_iter.c | 18 ++++++++--------- + 9 files changed, 118 insertions(+), 38 deletions(-) +Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' 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 +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/rtc/alphascale,asm9260-rtc.txt | 19 -- + .../bindings/rtc/alphascale,asm9260-rtc.yaml | 50 +++ + .../devicetree/bindings/rtc/armada-380-rtc.txt | 24 -- + .../devicetree/bindings/rtc/digicolor-rtc.txt | 17 - + .../devicetree/bindings/rtc/fsl,stmp3xxx-rtc.yaml | 51 +++ + .../bindings/rtc/google,goldfish-rtc.txt | 17 - + .../devicetree/bindings/rtc/lpc32xx-rtc.txt | 15 - + .../bindings/rtc/marvell,armada-380-rtc.yaml | 51 +++ + .../devicetree/bindings/rtc/marvell,pxa-rtc.yaml | 40 +++ + .../devicetree/bindings/rtc/maxim,ds1742.txt | 12 - + .../devicetree/bindings/rtc/nxp,lpc1788-rtc.txt | 21 -- + .../devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml | 58 ++++ + .../devicetree/bindings/rtc/orion-rtc.txt | 18 -- + Documentation/devicetree/bindings/rtc/pxa-rtc.txt | 14 - + .../devicetree/bindings/rtc/rtc-aspeed.txt | 22 -- + .../devicetree/bindings/rtc/spear-rtc.txt | 15 - + .../devicetree/bindings/rtc/stmp3xxx-rtc.txt | 21 -- + .../devicetree/bindings/rtc/trivial-rtc.yaml | 21 ++ + .../devicetree/bindings/rtc/via,vt8500-rtc.txt | 15 - + MAINTAINERS | 1 - + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/lib_test.c | 33 +- + drivers/rtc/rtc-cros-ec.c | 9 +- + drivers/rtc/rtc-mcp795.c | 1 - + drivers/rtc/rtc-nct3018y.c | 15 +- + drivers/rtc/rtc-rx8111.c | 356 +++++++++++++++++++++ + 27 files changed, 681 insertions(+), 246 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/armada-380-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/digicolor-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/fsl,stmp3xxx-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/marvell,armada-380-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/marvell,pxa-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/maxim,ds1742.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/orion-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/pxa-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-aspeed.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/spear-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/via,vt8500-rtc.txt + create mode 100644 drivers/rtc/rtc-rx8111.c +Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc) +$ 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 +Auto-merging MAINTAINERS +Auto-merging tools/testing/nvdimm/test/ndtest.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + arch/powerpc/platforms/pseries/papr_scm.c | 43 +------------------ + drivers/dax/bus.c | 3 +- + drivers/nvdimm/btt.c | 12 ++++-- + drivers/nvdimm/core.c | 30 ------------- + drivers/nvdimm/nd.h | 1 - + include/linux/papr_scm.h | 49 ++++++++++++++++++++++ + .../uapi/asm => include/uapi/linux}/papr_pdsm.h | 0 + tools/testing/nvdimm/test/ndtest.c | 2 + + tools/testing/nvdimm/test/ndtest.h | 31 -------------- + 10 files changed, 64 insertions(+), 109 deletions(-) + create mode 100644 include/linux/papr_scm.h + rename {arch/powerpc/include/uapi/asm => include/uapi/linux}/papr_pdsm.h (100%) +Merging at24/at24/for-next (4cece7649650 Linux 6.9-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 (9341b37ec17a ntb_perf: Fix printk format) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2) +$ 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 (c5eeb63edac9 fsi: Fix panic on scom file read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Merge made by the 'ort' strategy. + drivers/fsi/fsi-sbefifo.c | 9 ++++++++- + drivers/fsi/i2cr-scom.c | 11 ++++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) +Merging slimbus/for-next (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ctrl.c | 6 +++--- + drivers/slimbus/qcom-ngd-ctrl.c | 20 ++++++++++---------- + 2 files changed, 13 insertions(+), 13 deletions(-) +Merging nvmem/for-next (9e29a1dba59b nvmem: meson-mx-efuse: Remove nvmem_device from efuse struct) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml | 4 ++++ + Documentation/devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 2 +- + drivers/nvmem/core.c | 2 +- + drivers/nvmem/layouts.c | 6 ++++-- + drivers/nvmem/layouts/onie-tlv.c | 1 - + drivers/nvmem/layouts/sl28vpd.c | 1 - + drivers/nvmem/lpc18xx_eeprom.c | 6 ++---- + drivers/nvmem/meson-mx-efuse.c | 6 +++--- + drivers/nvmem/sc27xx-efuse.c | 1 + + drivers/nvmem/sprd-efuse.c | 1 + + include/linux/nvmem-provider.h | 5 ++++- + 11 files changed, 21 insertions(+), 14 deletions(-) +Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Merge made by the 'ort' strategy. + drivers/auxdisplay/Kconfig | 346 ++++++++++++++++++++------------------ + drivers/auxdisplay/Makefile | 10 +- + drivers/auxdisplay/charlcd.c | 3 + + drivers/auxdisplay/seg-led-gpio.c | 6 +- + 4 files changed, 189 insertions(+), 176 deletions(-) +Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code) +$ 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 +Merge made by the 'ort' strategy. + drivers/tty/serial/kgdboc.c | 30 ++++++++- + kernel/debug/kdb/kdb_io.c | 153 ++++++++++++++++++++++---------------------- + kernel/debug/kdb/kdb_main.c | 2 +- + 3 files changed, 108 insertions(+), 77 deletions(-) +Merging hmm/hmm (6613476e225e Linux 6.8-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 (06c2afb862f9 Linux 6.5-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 (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode) +$ 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 'ort' strategy. + Documentation/ABI/stable/sysfs-bus-mhi | 13 ++++++++++ + drivers/bus/mhi/host/init.c | 41 +++++++++++++++++++++++++++---- + drivers/bus/mhi/host/internal.h | 4 ++- + drivers/bus/mhi/host/main.c | 16 ++++++++++++ + drivers/bus/mhi/host/pci_generic.c | 45 ++++++++++++++++++++++++++++++++++ + drivers/bus/mhi/host/pm.c | 42 ++++++++++++++++++++++++++----- + include/linux/mhi.h | 29 +++++++++++++++++++++- + 7 files changed, 177 insertions(+), 13 deletions(-) +Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry) +$ 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 'ort' strategy. + mm/memblock.c | 7 ++----- + tools/testing/memblock/tests/basic_api.c | 8 ++++---- + tools/testing/memblock/tests/common.c | 4 ++-- + 3 files changed, 8 insertions(+), 11 deletions(-) +Merging cxl/next (62dba604a488 cxl/hdm: Debug, use decoder name function) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Merge made by the 'ort' strategy. + drivers/cxl/Kconfig | 1 + + drivers/cxl/core/hdm.c | 13 ++++++++----- + drivers/cxl/cxl.h | 2 ++ + drivers/cxl/pmem.c | 2 -- + tools/testing/cxl/test/mem.c | 19 +++++++++++++++---- + 5 files changed, 26 insertions(+), 11 deletions(-) +Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Merge made by the 'ort' strategy. + include/linux/zstd.h | 2 +- + include/linux/zstd_errors.h | 23 +- + include/linux/zstd_lib.h | 697 ++++++++-- + lib/zstd/Makefile | 2 +- + lib/zstd/common/allocations.h | 56 + + lib/zstd/common/bits.h | 149 ++ + lib/zstd/common/bitstream.h | 53 +- + lib/zstd/common/compiler.h | 14 +- + lib/zstd/common/cpu.h | 3 +- + lib/zstd/common/debug.c | 5 +- + lib/zstd/common/debug.h | 3 +- + lib/zstd/common/entropy_common.c | 42 +- + lib/zstd/common/error_private.c | 12 +- + lib/zstd/common/error_private.h | 3 +- + lib/zstd/common/fse.h | 89 +- + lib/zstd/common/fse_decompress.c | 94 +- + lib/zstd/common/huf.h | 234 +--- + lib/zstd/common/mem.h | 2 +- + lib/zstd/common/portability_macros.h | 26 +- + lib/zstd/common/zstd_common.c | 38 +- + lib/zstd/common/zstd_deps.h | 16 +- + lib/zstd/common/zstd_internal.h | 99 +- + lib/zstd/compress/clevels.h | 3 +- + lib/zstd/compress/fse_compress.c | 59 +- + lib/zstd/compress/hist.c | 3 +- + lib/zstd/compress/hist.h | 3 +- + lib/zstd/compress/huf_compress.c | 372 +++-- + lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++------- + lib/zstd/compress/zstd_compress_internal.h | 333 +++-- + lib/zstd/compress/zstd_compress_literals.c | 155 ++- + lib/zstd/compress/zstd_compress_literals.h | 25 +- + lib/zstd/compress/zstd_compress_sequences.c | 7 +- + lib/zstd/compress/zstd_compress_sequences.h | 3 +- + lib/zstd/compress/zstd_compress_superblock.c | 47 +- + lib/zstd/compress/zstd_compress_superblock.h | 3 +- + lib/zstd/compress/zstd_cwksp.h | 149 +- + lib/zstd/compress/zstd_double_fast.c | 129 +- + lib/zstd/compress/zstd_double_fast.h | 6 +- + lib/zstd/compress/zstd_fast.c | 578 ++++++-- + lib/zstd/compress/zstd_fast.h | 6 +- + lib/zstd/compress/zstd_lazy.c | 518 +++---- + lib/zstd/compress/zstd_lazy.h | 7 +- + lib/zstd/compress/zstd_ldm.c | 11 +- + lib/zstd/compress/zstd_ldm.h | 3 +- + lib/zstd/compress/zstd_ldm_geartab.h | 3 +- + lib/zstd/compress/zstd_opt.c | 187 +-- + lib/zstd/compress/zstd_opt.h | 3 +- + lib/zstd/decompress/huf_decompress.c | 772 +++++++---- + lib/zstd/decompress/zstd_ddict.c | 9 +- + lib/zstd/decompress/zstd_ddict.h | 3 +- + lib/zstd/decompress/zstd_decompress.c | 259 +++- + lib/zstd/decompress/zstd_decompress_block.c | 283 ++-- + lib/zstd/decompress/zstd_decompress_block.h | 8 +- + lib/zstd/decompress/zstd_decompress_internal.h | 7 +- + lib/zstd/decompress_sources.h | 2 +- + lib/zstd/zstd_common_module.c | 5 +- + lib/zstd/zstd_compress_module.c | 2 +- + lib/zstd/zstd_decompress_module.c | 4 +- + 58 files changed, 4791 insertions(+), 2596 deletions(-) + create mode 100644 lib/zstd/common/allocations.h + create mode 100644 lib/zstd/common/bits.h +Merging efi/next (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated) +$ 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 'ort' strategy. + Documentation/ABI/removed/sysfs-firmware-efi-vars | 12 ++++ + Documentation/ABI/stable/sysfs-firmware-efi-vars | 79 ----------------------- + Documentation/filesystems/efivarfs.rst | 2 +- + drivers/firmware/efi/efi-pstore.c | 10 ++- + drivers/firmware/efi/libstub/fdt.c | 4 +- + drivers/firmware/efi/vars.c | 2 +- + fs/efivarfs/internal.h | 5 +- + fs/efivarfs/vars.c | 5 +- + include/linux/efi.h | 9 ++- + 9 files changed, 33 insertions(+), 95 deletions(-) + create mode 100644 Documentation/ABI/removed/sysfs-firmware-efi-vars + delete mode 100644 Documentation/ABI/stable/sysfs-firmware-efi-vars +Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/utf8-selftest.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging slab/slab/for-next (b3d8a8e87014 slub: use count_partial_free_approx() in slab_out_of_memory()) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging mm/slab.h +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + lib/slub_kunit.c | 2 +- + mm/slab.h | 3 -- + mm/slab_common.c | 2 - + mm/slub.c | 116 ++++++++++++++++++++++++++++++++++++++++--------------- + 4 files changed, 86 insertions(+), 37 deletions(-) +Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging MAINTAINERS +Auto-merging drivers/virt/vmgenid.c +CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c +Resolved 'drivers/virt/vmgenid.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1798fd39dde8] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/rng/microsoft,vmgenid.yaml | 49 +++++++ + MAINTAINERS | 1 + + drivers/virt/Kconfig | 1 - + drivers/virt/vmgenid.c | 151 ++++++++++++++++----- + 4 files changed, 166 insertions(+), 36 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/microsoft,vmgenid.yaml +Merging landlock/next (046892f93be4 MAINTAINERS: Add Günther Noack as Landlock reviewer) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 78 ++++- + MAINTAINERS | 2 + + fs/ioctl.c | 3 + + include/uapi/linux/landlock.h | 38 ++- + samples/landlock/sandboxer.c | 18 +- + security/landlock/fs.c | 225 ++++++++++++- + security/landlock/limits.h | 2 +- + security/landlock/syscalls.c | 2 +- + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/fs_test.c | 486 ++++++++++++++++++++++++++- + 10 files changed, 810 insertions(+), 46 deletions(-) +Merging rust/rust-next (2c1092853f16 rust: kernel: remove usage of `allocator_api` unstable feature) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/process/changes.rst +Auto-merging rust/Makefile +Auto-merging rust/kernel/init.rs +Auto-merging rust/kernel/lib.rs +Auto-merging scripts/Makefile.build +Merge made by the 'ort' strategy. + Documentation/process/changes.rst | 2 +- + rust/Makefile | 16 +- + rust/alloc/README.md | 36 - + rust/alloc/alloc.rs | 452 ----- + rust/alloc/boxed.rs | 2463 ----------------------- + rust/alloc/collections/mod.rs | 160 -- + rust/alloc/lib.rs | 288 --- + rust/alloc/raw_vec.rs | 611 ------ + rust/alloc/slice.rs | 890 -------- + rust/alloc/vec/drain.rs | 255 --- + rust/alloc/vec/extract_if.rs | 115 -- + rust/alloc/vec/into_iter.rs | 454 ----- + rust/alloc/vec/is_zero.rs | 204 -- + rust/alloc/vec/mod.rs | 3683 ---------------------------------- + rust/alloc/vec/partial_eq.rs | 49 - + rust/alloc/vec/set_len_on_drop.rs | 35 - + rust/alloc/vec/spec_extend.rs | 119 -- + rust/bindings/bindings_helper.h | 3 + + rust/kernel/alloc.rs | 74 + + rust/kernel/{ => alloc}/allocator.rs | 17 +- + rust/kernel/alloc/box_ext.rs | 57 + + rust/kernel/alloc/vec_ext.rs | 176 ++ + rust/kernel/error.rs | 13 +- + rust/kernel/init.rs | 57 +- + rust/kernel/init/macros.rs | 19 +- + rust/kernel/lib.rs | 13 +- + rust/kernel/prelude.rs | 2 + + rust/kernel/str.rs | 93 +- + rust/kernel/sync/arc.rs | 50 +- + rust/kernel/sync/condvar.rs | 2 +- + rust/kernel/sync/lock/mutex.rs | 2 +- + rust/kernel/sync/lock/spinlock.rs | 2 +- + rust/kernel/types.rs | 4 +- + rust/kernel/workqueue.rs | 47 +- + rust/macros/helpers.rs | 124 +- + rust/macros/pin_data.rs | 2 + + rust/macros/zeroable.rs | 1 + + samples/rust/rust_minimal.rs | 6 +- + samples/rust/rust_print.rs | 4 +- + scripts/Makefile.build | 2 +- + scripts/Makefile.debug | 8 + + scripts/generate_rust_analyzer.py | 2 +- + scripts/min-tool-version.sh | 2 +- + 43 files changed, 639 insertions(+), 9975 deletions(-) + delete mode 100644 rust/alloc/README.md + delete mode 100644 rust/alloc/alloc.rs + delete mode 100644 rust/alloc/boxed.rs + delete mode 100644 rust/alloc/collections/mod.rs + delete mode 100644 rust/alloc/lib.rs + delete mode 100644 rust/alloc/raw_vec.rs + delete mode 100644 rust/alloc/slice.rs + delete mode 100644 rust/alloc/vec/drain.rs + delete mode 100644 rust/alloc/vec/extract_if.rs + delete mode 100644 rust/alloc/vec/into_iter.rs + delete mode 100644 rust/alloc/vec/is_zero.rs + delete mode 100644 rust/alloc/vec/mod.rs + delete mode 100644 rust/alloc/vec/partial_eq.rs + delete mode 100644 rust/alloc/vec/set_len_on_drop.rs + delete mode 100644 rust/alloc/vec/spec_extend.rs + create mode 100644 rust/kernel/alloc.rs + rename rust/kernel/{ => alloc}/allocator.rs (86%) + create mode 100644 rust/kernel/alloc/box_ext.rs + create mode 100644 rust/kernel/alloc/vec_ext.rs +Merging sysctl/sysctl-next (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Auto-merging include/linux/sysctl.h +Auto-merging ipc/ipc_sysctl.c +Auto-merging ipc/mq_sysctl.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/exit.c +Auto-merging kernel/kprobes.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/topology.c +Auto-merging kernel/signal.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/ucount.c +Auto-merging kernel/watchdog.c +Merge made by the 'ort' strategy. + fs/proc/proc_sysctl.c | 21 +++++++++------------ + include/linux/sysctl.h | 25 ++++++++++++------------- + ipc/ipc_sysctl.c | 5 ++--- + ipc/mq_sysctl.c | 5 ++--- + kernel/acct.c | 1 - + kernel/bpf/syscall.c | 1 - + kernel/delayacct.c | 1 - + kernel/exit.c | 1 - + kernel/hung_task.c | 1 - + kernel/kexec_core.c | 1 - + kernel/kprobes.c | 1 - + kernel/latencytop.c | 1 - + kernel/panic.c | 1 - + kernel/pid_namespace.c | 1 - + kernel/pid_sysctl.h | 1 - + kernel/printk/sysctl.c | 1 - + kernel/reboot.c | 1 - + kernel/sched/autogroup.c | 1 - + kernel/sched/core.c | 1 - + kernel/sched/deadline.c | 1 - + kernel/sched/fair.c | 1 - + kernel/sched/rt.c | 1 - + kernel/sched/topology.c | 1 - + kernel/seccomp.c | 1 - + kernel/signal.c | 1 - + kernel/stackleak.c | 1 - + kernel/sysctl.c | 2 -- + kernel/time/timer.c | 1 - + kernel/trace/ftrace.c | 1 - + kernel/trace/trace_events_user.c | 1 - + kernel/ucount.c | 5 ++--- + kernel/umh.c | 1 - + kernel/utsname_sysctl.c | 1 - + kernel/watchdog.c | 2 -- + net/sysctl_net.c | 3 +-- + 35 files changed, 28 insertions(+), 67 deletions(-) +Merging execve/for-next/execve (10e29251be0e binfmt_elf_fdpic: fix /proc/<pid>/auxv) +$ 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 +Auto-merging arch/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging fs/binfmt_elf.c +Auto-merging fs/exec.c +Auto-merging include/trace/events/sched.h +Merge made by the 'ort' strategy. + arch/Kconfig | 9 +++++ + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/elf.h | 2 - + fs/binfmt_elf.c | 3 ++ + fs/binfmt_elf_fdpic.c | 87 +++++++++++++++++++----------------------- + fs/exec.c | 8 ++++ + include/linux/elf.h | 2 +- + include/trace/events/sched.h | 35 +++++++++++++++++ + 8 files changed, 97 insertions(+), 50 deletions(-) +Merging bitmap/bitmap-for-next (36a71c558b3e sched/topology: Optimize topology_span_sane()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/cpumask.h +Auto-merging kernel/sched/topology.c +Merge made by the 'ort' strategy. + include/linux/cpumask.h | 10 ++++++++++ + kernel/sched/topology.c | 6 ++---- + 2 files changed, 12 insertions(+), 4 deletions(-) +Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Merge made by the 'ort' strategy. + drivers/hte/hte-tegra194-test.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging kspp/for-next/kspp (207fa4298699 kunit/fortify: Add memcpy() tests) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/message/fusion/mptsas.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_transport.c +Auto-merging include/linux/fortify-string.h +Auto-merging include/linux/string.h +Auto-merging kernel/configs/hardening.config +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + arch/arm64/configs/hardening.config | 5 + + arch/x86/configs/hardening.config | 9 + + drivers/message/fusion/mptsas.c | 14 +- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 14 +- + drivers/scsi/qla2xxx/qla_mr.c | 6 +- + drivers/virt/acrn/ioreq.c | 2 +- + fs/ecryptfs/crypto.c | 4 +- + fs/ecryptfs/main.c | 26 +- + fs/hfsplus/xattr.c | 22 +- + fs/reiserfs/item_ops.c | 13 +- + include/linux/fortify-string.h | 6 +- + include/linux/string.h | 49 ++++ + init/do_mounts.c | 3 +- + kernel/configs/hardening.config | 4 + + lib/Kconfig.debug | 10 - + lib/Makefile | 2 - + lib/fortify_kunit.c | 190 ++++++++++---- + lib/memcpy_kunit.c | 53 ---- + lib/strcat_kunit.c | 104 -------- + lib/string_kunit.c | 461 ++++++++++++++++++++++++++++++++- + lib/strscpy_kunit.c | 142 ---------- + lib/ubsan.h | 43 +-- + 23 files changed, 722 insertions(+), 463 deletions(-) + delete mode 100644 lib/strcat_kunit.c + delete mode 100644 lib/strscpy_kunit.c +Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) +$ 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 +Already up to date. +Merging nolibc/nolibc (0adab2b6b733 tools/nolibc: add support for uname(2)) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Merge made by the 'ort' strategy. + tools/include/nolibc/stdlib.h | 2 +- + tools/include/nolibc/string.h | 44 ++++++++------- + tools/include/nolibc/sys.h | 27 +++++++++ + tools/testing/selftests/nolibc/nolibc-test.c | 82 ++++++++++++++++++++++++++++ + 4 files changed, 135 insertions(+), 20 deletions(-) +Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) +$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next +Already up to date. +Merging iommufd/for-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging turbostat/next (c9d066401193 tools/power turbostat: version 2024.04.27) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/Makefile | 27 +- + tools/power/x86/turbostat/turbostat.8 | 4 +- + tools/power/x86/turbostat/turbostat.c | 485 ++++++++++++++++++++++------------ + 3 files changed, 343 insertions(+), 173 deletions(-) +Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap) +$ git merge -m Merge branch 'refactor-heap' of https://evilpiepirate.org/git/bcachefs.git refactor-heap/refactor-heap +Auto-merging fs/bcachefs/ec.c +Auto-merging fs/bcachefs/util.c +Auto-merging fs/bcachefs/util.h +Auto-merging kernel/events/core.c +Merge made by the 'ort' strategy. + drivers/md/bcache/alloc.c | 64 ++++++++++---- + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/bset.c | 84 ++++++++++++------ + drivers/md/bcache/bset.h | 14 +-- + drivers/md/bcache/btree.c | 17 +++- + drivers/md/bcache/extents.c | 53 +++++++----- + drivers/md/bcache/movinggc.c | 41 ++++++--- + drivers/md/bcache/sysfs.c | 2 + + drivers/md/bcache/util.c | 2 +- + drivers/md/bcache/util.h | 67 +-------------- + drivers/md/bcache/writeback.c | 3 + + drivers/md/dm-vdo/repair.c | 19 +++-- + drivers/md/dm-vdo/slab-depot.c | 14 +-- + fs/bcachefs/clock.c | 43 +++++++--- + fs/bcachefs/clock_types.h | 2 +- + fs/bcachefs/ec.c | 78 +++++++++++------ + fs/bcachefs/ec_types.h | 2 +- + fs/bcachefs/util.c | 2 +- + fs/bcachefs/util.h | 118 +------------------------- + include/linux/min_heap.h | 188 +++++++++++++++++++++++++++++++---------- + kernel/events/core.c | 29 ++++--- + lib/test_min_heap.c | 75 +++++++++++----- + 22 files changed, 523 insertions(+), 396 deletions(-) +Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) +$ git merge -m Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git header_cleanup/header_cleanup +Already up to date. +$ git am -3 ../patches/0001-Revert-firmware-dmi-Stop-decoding-on-broken-entry.patch +Applying: Revert "firmware: dmi: Stop decoding on broken entry" |