Cross-merge networking fixes after downstream PR (net-6.15-rc3).
No conflicts. Adjacent changes:
tools/net/ynl/pyynl/ynl_gen_c.py
4d07bbf2d456 ("tools: ynl-gen: don't declare loop iterator in place")
7e8ba0c7de2b ("tools: ynl: don't use genlmsghdr in classic netlink")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | .mailmap | 5 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-ufs | 32 | |
| -rw-r--r-- | Documentation/admin-guide/hw-vuln/index.rst | 1 | |
| -rw-r--r-- | Documentation/admin-guide/hw-vuln/rsb.rst | 268 | |
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 5 | |
| -rw-r--r-- | Documentation/admin-guide/xfs.rst | 50 | |
| -rw-r--r-- | Documentation/arch/x86/cpuinfo.rst | 69 | |
| -rw-r--r-- | Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml | 18 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/soc/fsl/fsl,ls1028a-reset.yaml | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/nxp,sysctr-timer.yaml | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/timer/renesas,tpu.yaml | 56 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/microchip,usb5744.yaml | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/usb/xlnx,usb2.yaml | 1 | |
| -rw-r--r-- | Documentation/filesystems/ext4/super.rst | 20 | |
| -rw-r--r-- | Documentation/netlink/specs/ovs_vport.yaml | 4 | |
| -rw-r--r-- | Documentation/netlink/specs/rt-link.yaml | 20 | |
| -rw-r--r-- | Documentation/netlink/specs/rt-neigh.yaml | 14 | |
| -rw-r--r-- | Documentation/userspace-api/mseal.rst | 2 | |
| -rw-r--r-- | Documentation/wmi/devices/msi-wmi-platform.rst | 4 | |
| -rw-r--r-- | MAINTAINERS | 18 | |
| -rw-r--r-- | Makefile | 2 | |
| -rw-r--r-- | arch/arm64/include/asm/rqspinlock.h | 2 | |
| -rw-r--r-- | arch/s390/Kconfig | 19 | |
| -rw-r--r-- | arch/s390/Makefile | 2 | |
| -rw-r--r-- | arch/s390/include/asm/march.h | 4 | |
| -rw-r--r-- | arch/s390/kernel/perf_cpum_cf.c | 11 | |
| -rw-r--r-- | arch/s390/kernel/perf_cpum_cf_events.c | 167 | |
| -rw-r--r-- | arch/s390/kernel/perf_cpum_sf.c | 3 | |
| -rw-r--r-- | arch/s390/kernel/processor.c | 4 | |
| -rw-r--r-- | arch/s390/tools/gen_facilities.c | 3 | |
| -rw-r--r-- | arch/x86/entry/entry.S | 9 | |
| -rw-r--r-- | arch/x86/include/asm/nospec-branch.h | 12 | |
| -rw-r--r-- | arch/x86/include/asm/smap.h | 12 | |
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 11 | |
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 1 | |
| -rw-r--r-- | arch/x86/kernel/cpu/bugs.c | 101 | |
| -rw-r--r-- | arch/x86/kernel/cpu/resctrl/rdtgroup.c | 48 | |
| -rw-r--r-- | arch/x86/kernel/e820.c | 17 | |
| -rw-r--r-- | arch/x86/kernel/early_printk.c | 10 | |
| -rw-r--r-- | arch/x86/mm/tlb.c | 6 | |
| -rw-r--r-- | arch/x86/power/hibernate_asm_64.S | 4 | |
| -rw-r--r-- | arch/x86/xen/multicalls.c | 26 | |
| -rw-r--r-- | arch/x86/xen/smp_pv.c | 1 | |
| -rw-r--r-- | arch/x86/xen/xen-asm.S | 4 | |
| -rw-r--r-- | arch/x86/xen/xen-ops.h | 3 | |
| -rw-r--r-- | crypto/ahash.c | 76 | |
| -rw-r--r-- | crypto/scompress.c | 10 | |
| -rw-r--r-- | drivers/accel/ivpu/ivpu_debugfs.c | 4 | |
| -rw-r--r-- | drivers/accel/ivpu/ivpu_ipc.c | 3 | |
| -rw-r--r-- | drivers/accel/ivpu/ivpu_ms.c | 24 | |
| -rw-r--r-- | drivers/acpi/button.c | 2 | |
| -rw-r--r-- | drivers/acpi/ec.c | 28 | |
| -rw-r--r-- | drivers/acpi/pptt.c | 4 | |
| -rw-r--r-- | drivers/ata/libata-sata.c | 15 | |
| -rw-r--r-- | drivers/ata/pata_pxa.c | 6 | |
| -rw-r--r-- | drivers/ata/sata_sx4.c | 13 | |
| -rw-r--r-- | drivers/block/null_blk/main.c | 2 | |
| -rw-r--r-- | drivers/bluetooth/btnxpuart.c | 21 | |
| -rw-r--r-- | drivers/bluetooth/btqca.c | 2 | |
| -rw-r--r-- | drivers/bluetooth/btrtl.c | 2 | |
| -rw-r--r-- | drivers/bluetooth/hci_vhci.c | 10 | |
| -rw-r--r-- | drivers/crypto/caam/qi.c | 6 | |
| -rw-r--r-- | drivers/crypto/tegra/tegra-se-aes.c | 5 | |
| -rw-r--r-- | drivers/dma-buf/udmabuf.c | 2 | |
| -rw-r--r-- | drivers/firmware/cirrus/test/cs_dsp_mock_mem_maps.c | 30 | |
| -rw-r--r-- | drivers/firmware/cirrus/test/cs_dsp_test_bin.c | 2 | |
| -rw-r--r-- | drivers/firmware/cirrus/test/cs_dsp_test_bin_error.c | 2 | |
| -rw-r--r-- | drivers/fpga/tests/fpga-bridge-test.c | 1 | |
| -rw-r--r-- | drivers/fpga/tests/fpga-mgr-test.c | 1 | |
| -rw-r--r-- | drivers/fpga/tests/fpga-region-test.c | 1 | |
| -rw-r--r-- | drivers/fwctl/main.c | 2 | |
| -rw-r--r-- | drivers/fwctl/pds/main.c | 33 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 27 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 19 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 4 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 4 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 21 | |
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 9 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 21 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 17 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 17 | |
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 9 | |
| -rw-r--r-- | drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 19 | |
| -rw-r--r-- | drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 | |
| -rw-r--r-- | drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 36 | |
| -rw-r--r-- | drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 | |
| -rw-r--r-- | drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 | |
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_bw.c | 14 | |
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 4 | |
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 49 | |
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_vblank.c | 4 | |
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_rc6.c | 19 | |
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_huc.c | 11 | |
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_huc.h | 1 | |
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_uc.c | 1 | |
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/opregion.c | 7 | |
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 | |
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_selftest.c | 18 | |
| -rw-r--r-- | drivers/gpu/drm/i915/soc/intel_dram.c | 4 | |
| -rw-r--r-- | drivers/gpu/drm/imagination/pvr_fw.c | 27 | |
| -rw-r--r-- | drivers/gpu/drm/imagination/pvr_job.c | 7 | |
| -rw-r--r-- | drivers/gpu/drm/imagination/pvr_queue.c | 4 | |
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 3 | |
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 3 | |
| -rw-r--r-- | drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 23 | |
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 6 | |
| -rw-r--r-- | drivers/gpu/drm/sti/Makefile | 2 | |
| -rw-r--r-- | drivers/gpu/drm/tests/drm_client_modeset_test.c | 9 | |
| -rw-r--r-- | drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 10 | |
| -rw-r--r-- | drivers/gpu/drm/tests/drm_kunit_helpers.c | 22 | |
| -rw-r--r-- | drivers/gpu/drm/tests/drm_modes_test.c | 26 | |
| -rw-r--r-- | drivers/gpu/drm/tests/drm_probe_helper_test.c | 8 | |
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_gem.c | 11 | |
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_plane.c | 20 | |
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_prime.c | 1 | |
| -rw-r--r-- | drivers/gpu/drm/xe/instructions/xe_gpu_commands.h | 1 | |
