]> www.infradead.org Git - users/hch/misc.git/log
users/hch/misc.git
2 months agoMerge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Stephen Rothwell [Tue, 13 May 2025 08:13:18 +0000 (18:13 +1000)]
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

2 months agoMerge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
Stephen Rothwell [Tue, 13 May 2025 08:13:15 +0000 (18:13 +1000)]
Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux...
Stephen Rothwell [Tue, 13 May 2025 08:13:13 +0000 (18:13 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git

2 months agoMerge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo...
Stephen Rothwell [Tue, 13 May 2025 08:13:10 +0000 (18:13 +1000)]
Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
Stephen Rothwell [Tue, 13 May 2025 08:13:08 +0000 (18:13 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git

2 months agoMerge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
Stephen Rothwell [Tue, 13 May 2025 08:13:06 +0000 (18:13 +1000)]
Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git

# Conflicts:
# drivers/iio/adc/ad7606.c

2 months agoMerge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git
Stephen Rothwell [Tue, 13 May 2025 08:13:02 +0000 (18:13 +1000)]
Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux...
Stephen Rothwell [Tue, 13 May 2025 08:12:59 +0000 (18:12 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git
Stephen Rothwell [Tue, 13 May 2025 08:12:57 +0000 (18:12 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git

2 months agoMerge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
Stephen Rothwell [Tue, 13 May 2025 08:12:53 +0000 (18:12 +1000)]
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git

2 months agoMerge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
Stephen Rothwell [Tue, 13 May 2025 08:12:51 +0000 (18:12 +1000)]
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git

# Conflicts:
# Documentation/devicetree/bindings/serial/snps-dw-apb-uart.yaml

2 months agoMerge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb...
Stephen Rothwell [Tue, 13 May 2025 08:12:48 +0000 (18:12 +1000)]
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderb...
Stephen Rothwell [Tue, 13 May 2025 08:12:46 +0000 (18:12 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git

2 months agoMerge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
Stephen Rothwell [Tue, 13 May 2025 08:12:44 +0000 (18:12 +1000)]
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git

# Conflicts:
# MAINTAINERS

2 months agoMerge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
Stephen Rothwell [Tue, 13 May 2025 08:12:40 +0000 (18:12 +1000)]
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git

2 months agoMerge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git
Stephen Rothwell [Tue, 13 May 2025 07:45:45 +0000 (17:45 +1000)]
Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git

2 months agoMerge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...
Stephen Rothwell [Tue, 13 May 2025 07:45:43 +0000 (17:45 +1000)]
Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platf...
Stephen Rothwell [Tue, 13 May 2025 07:45:40 +0000 (17:45 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platfo...
Stephen Rothwell [Tue, 13 May 2025 07:45:39 +0000 (17:45 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git

# Conflicts:
# drivers/platform/x86/asus-wmi.c
# drivers/platform/x86/dell/alienware-wmi-wmax.c
# drivers/platform/x86/intel/speed_select_if/isst_if_common.c

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git
Stephen Rothwell [Tue, 13 May 2025 07:45:35 +0000 (17:45 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
Stephen Rothwell [Tue, 13 May 2025 07:45:33 +0000 (17:45 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git

2 months agoMerge branch 'next' of https://github.com/kvm-x86/linux.git
Stephen Rothwell [Tue, 13 May 2025 07:22:26 +0000 (17:22 +1000)]
Merge branch 'next' of https://github.com/kvm-x86/linux.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
Stephen Rothwell [Tue, 13 May 2025 07:22:23 +0000 (17:22 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git
Stephen Rothwell [Tue, 13 May 2025 07:22:21 +0000 (17:22 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git

# Conflicts:
# arch/x86/kvm/vmx/vmx.c

2 months agoMerge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...
Stephen Rothwell [Tue, 13 May 2025 06:55:19 +0000 (16:55 +1000)]
Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git
Stephen Rothwell [Tue, 13 May 2025 06:55:17 +0000 (16:55 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...
Stephen Rothwell [Tue, 13 May 2025 06:55:14 +0000 (16:55 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git

2 months agoMerge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras...
Stephen Rothwell [Tue, 13 May 2025 06:55:12 +0000 (16:55 +1000)]
Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git

2 months agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
Stephen Rothwell [Tue, 13 May 2025 06:55:10 +0000 (16:55 +1000)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git

# Conflicts:
# Documentation/admin-guide/hw-vuln/index.rst
# arch/loongarch/kernel/entry.S
# arch/x86/Kconfig.assembler
# arch/x86/include/asm/cpufeatures.h
# arch/x86/kernel/alternative.c
# arch/x86/kernel/cpu/bugs.c
# arch/x86/kernel/cpu/common.c
# drivers/base/cpu.c
# drivers/cpufreq/amd-pstate.c
# drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
# include/linux/cpu.h

2 months agoMerge 6.15-rc6 into staging-next
Greg Kroah-Hartman [Tue, 13 May 2025 06:37:56 +0000 (08:37 +0200)]
Merge 6.15-rc6 into staging-next

We need the staging changes in here as well

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 months agoMerge 6.15-rc6 into usb-next
Greg Kroah-Hartman [Tue, 13 May 2025 06:26:58 +0000 (08:26 +0200)]
Merge 6.15-rc6 into usb-next

We need the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 months agoMerge 6.15-rc6 into char-misc-next
Greg Kroah-Hartman [Tue, 13 May 2025 06:19:37 +0000 (08:19 +0200)]
Merge 6.15-rc6 into char-misc-next

We need the iio/hyperv fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Tue, 13 May 2025 05:18:26 +0000 (15:18 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux...
Stephen Rothwell [Tue, 13 May 2025 05:15:32 +0000 (15:15 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git

# Conflicts:
# MAINTAINERS

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
Stephen Rothwell [Tue, 13 May 2025 05:15:28 +0000 (15:15 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git

# Conflicts:
# MAINTAINERS

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
Stephen Rothwell [Tue, 13 May 2025 05:11:45 +0000 (15:11 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
Stephen Rothwell [Tue, 13 May 2025 05:11:43 +0000 (15:11 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux...
Stephen Rothwell [Tue, 13 May 2025 05:01:04 +0000 (15:01 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git

2 months agoMerge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git
Stephen Rothwell [Tue, 13 May 2025 05:01:02 +0000 (15:01 +1000)]
Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
Stephen Rothwell [Tue, 13 May 2025 05:01:00 +0000 (15:01 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git

2 months agoMerge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
Stephen Rothwell [Tue, 13 May 2025 05:00:58 +0000 (15:00 +1000)]
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

# Conflicts:
# kernel/kexec_file.c

2 months agoMerge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj...
Stephen Rothwell [Tue, 13 May 2025 05:00:55 +0000 (15:00 +1000)]
Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
Stephen Rothwell [Tue, 13 May 2025 05:00:50 +0000 (15:00 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Tue, 13 May 2025 04:34:00 +0000 (14:34 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...
Stephen Rothwell [Tue, 13 May 2025 04:33:58 +0000 (14:33 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git

2 months agoMerge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
Stephen Rothwell [Tue, 13 May 2025 04:33:56 +0000 (14:33 +1000)]
Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git

2 months agoMerge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...
Stephen Rothwell [Tue, 13 May 2025 04:33:54 +0000 (14:33 +1000)]
Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
Stephen Rothwell [Tue, 13 May 2025 04:33:51 +0000 (14:33 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
Stephen Rothwell [Tue, 13 May 2025 04:33:49 +0000 (14:33 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mappe...
Stephen Rothwell [Tue, 13 May 2025 04:33:47 +0000 (14:33 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git

2 months agoMerge branch 'for-next' of git://git.kernel.dk/linux-block.git
Stephen Rothwell [Tue, 13 May 2025 04:33:45 +0000 (14:33 +1000)]
Merge branch 'for-next' of git://git.kernel.dk/linux-block.git

# Conflicts:
# fs/gfs2/ops_fstype.c

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
Stephen Rothwell [Tue, 13 May 2025 04:33:42 +0000 (14:33 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git

2 months agoMerge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules...
Stephen Rothwell [Tue, 13 May 2025 04:33:37 +0000 (14:33 +1000)]
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Tue, 13 May 2025 04:14:42 +0000 (14:14 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
Stephen Rothwell [Tue, 13 May 2025 04:14:40 +0000 (14:14 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Stephen Rothwell [Tue, 13 May 2025 04:11:53 +0000 (14:11 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux...
Stephen Rothwell [Tue, 13 May 2025 04:11:51 +0000 (14:11 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git

2 months agoMerge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel
Stephen Rothwell [Tue, 13 May 2025 03:53:46 +0000 (13:53 +1000)]
Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel

2 months agoMerge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git
Stephen Rothwell [Tue, 13 May 2025 03:53:45 +0000 (13:53 +1000)]
Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git

# Conflicts:
# rust/helpers/helpers.c
# samples/rust/Makefile

2 months agoMerge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git
Stephen Rothwell [Tue, 13 May 2025 03:49:13 +0000 (13:49 +1000)]
Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git

2 months agoMerge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git
Stephen Rothwell [Tue, 13 May 2025 03:49:11 +0000 (13:49 +1000)]
Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git

2 months agoMerge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git
Stephen Rothwell [Tue, 13 May 2025 03:49:08 +0000 (13:49 +1000)]
Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git

2 months agoMerge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeink...
Stephen Rothwell [Tue, 13 May 2025 03:49:07 +0000 (13:49 +1000)]
Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git

2 months agoMerge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git
Stephen Rothwell [Tue, 13 May 2025 03:49:02 +0000 (13:49 +1000)]
Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git

# Conflicts:
# drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c
# drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c
# drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c
# drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c
# drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
# drivers/gpu/drm/xe/xe_svm.h

2 months agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto...
Stephen Rothwell [Tue, 13 May 2025 03:43:30 +0000 (13:43 +1000)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git

2 months agoMerge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd...
Stephen Rothwell [Tue, 13 May 2025 03:43:28 +0000 (13:43 +1000)]
Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git

2 months agoMerge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Stephen Rothwell [Tue, 13 May 2025 03:43:26 +0000 (13:43 +1000)]
Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git

2 months agoMerge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
Stephen Rothwell [Tue, 13 May 2025 03:43:24 +0000 (13:43 +1000)]
Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git

2 months agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan...
Stephen Rothwell [Tue, 13 May 2025 03:16:31 +0000 (13:16 +1000)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git

2 months agoMerge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
Stephen Rothwell [Tue, 13 May 2025 03:10:21 +0000 (13:10 +1000)]
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless...
Stephen Rothwell [Tue, 13 May 2025 03:05:26 +0000 (13:05 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git

2 months agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...
Stephen Rothwell [Tue, 13 May 2025 03:05:25 +0000 (13:05 +1000)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git

# Conflicts:
# drivers/bluetooth/btusb.c
# include/net/bluetooth/hci_core.h
# net/bluetooth/hci_conn.c
# net/bluetooth/hci_sync.c
# net/bluetooth/l2cap_core.c

2 months agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
Stephen Rothwell [Tue, 13 May 2025 03:05:20 +0000 (13:05 +1000)]
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git

# Conflicts:
# drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf...
Stephen Rothwell [Tue, 13 May 2025 03:05:17 +0000 (13:05 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git

2 months agoMerge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
Stephen Rothwell [Tue, 13 May 2025 03:05:15 +0000 (13:05 +1000)]
Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git

# Conflicts:
# MAINTAINERS
# drivers/infiniband/hw/irdma/main.c

2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
Stephen Rothwell [Tue, 13 May 2025 02:37:27 +0000 (12:37 +1000)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

# Conflicts:
# drivers/infiniband/sw/rxe/rxe_mr.c
# drivers/infiniband/sw/rxe/rxe_resp.c

2 months agoMerge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
Stephen Rothwell [Tue, 13 May 2025 02:33:44 +0000 (12:33 +1000)]
Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git

2 months agoMerge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viresh...
Stephen Rothwell [Tue, 13 May 2025 02:33:43 +0000 (12:33 +1000)]
Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git

2 months agoMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
Stephen Rothwell [Tue, 13 May 2025 02:33:41 +0000 (12:33 +1000)]
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git

2 months agoMerge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git
Stephen Rothwell [Tue, 13 May 2025 02:02:43 +0000 (12:02 +1000)]
Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git

2 months agoMerge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel...
Stephen Rothwell [Tue, 13 May 2025 02:02:42 +0000 (12:02 +1000)]
Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git

# Conflicts:
# rust/bindings/bindings_helper.h
# rust/kernel/lib.rs

2 months agoMerge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
Stephen Rothwell [Tue, 13 May 2025 01:53:55 +0000 (11:53 +1000)]
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

2 months agonet: dsa: b53: implement setting ageing time
Jonas Gorski [Sat, 10 May 2025 09:22:11 +0000 (11:22 +0200)]
net: dsa: b53: implement setting ageing time

b53 supported switches support configuring ageing time between 1 and
1,048,575 seconds, so add an appropriate setter.

This allows b53 to pass the FDB learning test for both vlan aware and
vlan unaware bridges.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20250510092211.276541-1-jonas.gorski@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agonet: mlx4: add SOF_TIMESTAMPING_TX_SOFTWARE flag when getting ts info
Jason Xing [Sat, 10 May 2025 09:34:42 +0000 (17:34 +0800)]
net: mlx4: add SOF_TIMESTAMPING_TX_SOFTWARE flag when getting ts info

As mlx4 has implemented skb_tx_timestamp() in mlx4_en_xmit(), the
SOFTWARE flag is surely needed when users are trying to get timestamp
information.

Signed-off-by: Jason Xing <kernelxing@tencent.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20250510093442.79711-1-kerneljasonxing@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agonetlink: fix policy dump for int with validation callback
Jakub Kicinski [Fri, 9 May 2025 21:27:51 +0000 (14:27 -0700)]
netlink: fix policy dump for int with validation callback

Recent devlink change added validation of an integer value
via NLA_POLICY_VALIDATE_FN, for sparse enums. Handle this
in policy dump. We can't extract any info out of the callback,
so report only the type.

Fixes: 429ac6211494 ("devlink: define enum for attr types of dynamic attributes")
Reported-by: syzbot+01eb26848144516e7f0a@syzkaller.appspotmail.com
Link: https://patch.msgid.link/20250509212751.1905149-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux
Jakub Kicinski [Tue, 13 May 2025 01:48:26 +0000 (18:48 -0700)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux

Tony Nguyen says:

====================
Prepare for Intel IPU E2000 (GEN3)

This is the first part in introducing RDMA support for idpf.

----------------------------------------------------------------
Tatyana Nikolova says:

To align with review comments, the patch series introducing RDMA
RoCEv2 support for the Intel Infrastructure Processing Unit (IPU)
E2000 line of products is going to be submitted in three parts:

1. Modify ice to use specific and common IIDC definitions and
   pass a core device info to irdma.

2. Add RDMA support to idpf and modify idpf to use specific and
   common IIDC definitions and pass a core device info to irdma.

3. Add RDMA RoCEv2 support for the E2000 products, referred to as
   GEN3 to irdma.

This first part is a 5 patch series based on the original
"iidc/ice/irdma: Update IDC to support multiple consumers" patch
to allow for multiple CORE PCI drivers, using the auxbus.

Patches:
1) Move header file to new name for clarity and replace ice
   specific DSCP define with a kernel equivalent one in irdma
2) Unify naming convention
3) Separate header file into common and driver specific info
4) Replace ice specific DSCP define with a kernel equivalent
   one in ice
5) Implement core device info struct and update drivers to use it
----------------------------------------------------------------

v1: https://lore.kernel.org/20250505212037.2092288-1-anthony.l.nguyen@intel.com

IWL reviews:
[v5] https://lore.kernel.org/20250416021549.606-1-tatyana.e.nikolova@intel.com
[v4] https://lore.kernel.org/20250225050428.2166-1-tatyana.e.nikolova@intel.com
[v3] https://lore.kernel.org/20250207194931.1569-1-tatyana.e.nikolova@intel.com
[v2] https://lore.kernel.org/20240824031924.421-1-tatyana.e.nikolova@intel.com
[v1] https://lore.kernel.org/20240724233917.704-1-tatyana.e.nikolova@intel.com

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux:
  iidc/ice/irdma: Update IDC to support multiple consumers
  ice: Replace ice specific DSCP mapping num with a kernel define
  iidc/ice/irdma: Break iidc.h into two headers
  iidc/ice/irdma: Rename to iidc_* convention
  iidc/ice/irdma: Rename IDC header file

====================

Link: https://patch.msgid.link/20250509200712.2911060-1-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agoMerge branch 'net-vertexcom-mse102x-improve-rx-handling'
Jakub Kicinski [Tue, 13 May 2025 01:46:46 +0000 (18:46 -0700)]
Merge branch 'net-vertexcom-mse102x-improve-rx-handling'

Stefan Wahren says:

====================
net: vertexcom: mse102x: Improve RX handling

This series is the second part of two series for the Vertexcom driver.
It contains some improvements for the RX handling of the Vertexcom MSE102x.
====================

Link: https://patch.msgid.link/20250509120435.43646-1-wahrenst@gmx.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agonet: vertexcom: mse102x: Simplify mse102x_rx_pkt_spi
Stefan Wahren [Fri, 9 May 2025 12:04:35 +0000 (14:04 +0200)]
net: vertexcom: mse102x: Simplify mse102x_rx_pkt_spi

The function mse102x_rx_pkt_spi is used in two cases:
* initial polling to re-arm RX interrupt
* level based RX interrupt handler

Both of them doesn't need an open-coded retry mechanism.
In the first case the function can be called again, if the return code
is IRQ_NONE. This keeps the error behavior during netdev open.

In the second case the proper retry would be handled implicit by
the SPI interrupt. So drop the retry code and simplify the receive path.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Link: https://patch.msgid.link/20250509120435.43646-7-wahrenst@gmx.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agonet: vertexcom: mse102x: Return code for mse102x_rx_pkt_spi
Stefan Wahren [Fri, 9 May 2025 12:04:34 +0000 (14:04 +0200)]
net: vertexcom: mse102x: Return code for mse102x_rx_pkt_spi

The MSE102x doesn't provide any interrupt register, so the only way
to handle the level interrupt is to fetch the whole packet from
the MSE102x internal buffer via SPI. So in cases the interrupt
handler fails to do this, it should return IRQ_NONE. This allows
the core to disable the interrupt in case the issue persists
and prevent an interrupt storm.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Link: https://patch.msgid.link/20250509120435.43646-6-wahrenst@gmx.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agonet: vertexcom: mse102x: Implement flag for valid CMD
Stefan Wahren [Fri, 9 May 2025 12:04:33 +0000 (14:04 +0200)]
net: vertexcom: mse102x: Implement flag for valid CMD

After removal of the invalid command counter only a relevant debug
message is left, which can be cumbersome. So add a new flag to debugfs,
which indicates whether the driver has ever received a valid CMD.
This helps to differentiate between general and temporary receive
issues.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250509120435.43646-5-wahrenst@gmx.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agonet: vertexcom: mse102x: Drop invalid cmd stats
Stefan Wahren [Fri, 9 May 2025 12:04:32 +0000 (14:04 +0200)]
net: vertexcom: mse102x: Drop invalid cmd stats

There are several reasons for an invalid command response
by the MSE102x:
* SPI line interferences
* MSE102x is in reset or has no firmware
* MSE102x is busy
* no packet in MSE102x receive buffer

So the counter for invalid command isn't very helpful without
further context. So drop the confusing statistics counter,
but keep the debug messages about "unexpected response" in order
to debug possible hardware issues.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250509120435.43646-4-wahrenst@gmx.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agonet: vertexcom: mse102x: Add warning about IRQ trigger type
Stefan Wahren [Fri, 9 May 2025 12:04:31 +0000 (14:04 +0200)]
net: vertexcom: mse102x: Add warning about IRQ trigger type

The example of the initial DT binding of the Vertexcom MSE 102x suggested
a IRQ_TYPE_EDGE_RISING, which is wrong. So warn everyone to fix their
device tree to level based IRQ.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250509120435.43646-3-wahrenst@gmx.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agodt-bindings: vertexcom-mse102x: Fix IRQ type in example
Stefan Wahren [Fri, 9 May 2025 12:04:30 +0000 (14:04 +0200)]
dt-bindings: vertexcom-mse102x: Fix IRQ type in example

According to the MSE102x documentation the trigger type is a
high level.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://patch.msgid.link/20250509120435.43646-2-wahrenst@gmx.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agonet: phy: dp83867: use 2ns delay if not specified in DTB
Matthias Schiffer [Wed, 7 May 2025 10:13:21 +0000 (12:13 +0200)]
net: phy: dp83867: use 2ns delay if not specified in DTB

Most PHY drivers default to a 2ns delay if internal delay is requested
and no value is specified. Having a default value makes sense, as it
allows a Device Tree to only care about board design (whether there are
delays on the PCB or not), and not whether the delay is added on the MAC
or the PHY side when needed.

Whether the delays are actually applied is controlled by the
DP83867_RGMII_*_CLK_DELAY_EN flags, so the behavior is only changed in
configurations that would previously be rejected with -EINVAL.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Link: https://patch.msgid.link/e2509b248a11ee29ea408a50c231da4c1fa0863b.1746612711.git.matthias.schiffer@ew.tq-group.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agonet: phy: dp83867: remove check of delay strap configuration
Matthias Schiffer [Wed, 7 May 2025 10:13:20 +0000 (12:13 +0200)]
net: phy: dp83867: remove check of delay strap configuration

The check that intended to handle "rgmii" PHY mode differently to the
RGMII modes with internal delay never worked as intended:

- added in commit 2a10154abcb7 ("net: phy: dp83867: Add TI dp83867 phy"):
  logic error caused the condition to always evaluate to true
- changed in commit a46fa260f6f5 ("net: phy: dp83867: Fix warning check
  for setting the internal delay"): now the condition incorrectly
  evaluates to false for rgmii-txid
- removed in commit 2b892649254f ("net: phy: dp83867: Set up RGMII TX
  delay")

Around the time of the removal, commit c11669a2757e ("net: phy: dp83867:
Rework delay rgmii delay handling") started clearing the delay enable
flags in RGMIICTL. The change attempted to preserve the historical
behavior of not disabling internal delays with "rgmii" PHY mode and also
documented this in a comment, but due to a conflict between "Set up
RGMII TX delay" and "Rework delay rgmii delay handling", the behavior
dp83867_verify_rgmii_cfg() warned about (and that was also described in
a comment in dp83867_config_init()) disappeared in the following merge
of net into net-next in commit b4b12b0d2f02
("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net").

While is doesn't appear that this breaking change was intentional, it
has been like this since 2019, and the new behavior to disable the delays
with "rgmii" PHY mode is generally desirable - in particular with MAC
drivers that have to fix up the delay mode, resulting in the PHY driver
not even seeing the same mode that was specified in the Device Tree.

Remove the obsolete check and comment.

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Link: https://patch.msgid.link/8a286207cd11b460bb0dbd27931de3626b9d7575.1746612711.git.matthias.schiffer@ew.tq-group.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 months agoMerge branch 'next' of git://linuxtv.org/media-ci/media-pending.git
Stephen Rothwell [Tue, 13 May 2025 01:27:00 +0000 (11:27 +1000)]
Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git

# Conflicts:
# drivers/media/i2c/ds90ub960.c

2 months agoMerge branch 'docs-next' of git://git.lwn.net/linux.git
Stephen Rothwell [Tue, 13 May 2025 01:26:57 +0000 (11:26 +1000)]
Merge branch 'docs-next' of git://git.lwn.net/linux.git

2 months agoMerge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
Stephen Rothwell [Tue, 13 May 2025 01:26:56 +0000 (11:26 +1000)]
Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git

2 months agoMerge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi...
Stephen Rothwell [Tue, 13 May 2025 01:26:54 +0000 (11:26 +1000)]
Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git

2 months agoMerge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
Stephen Rothwell [Tue, 13 May 2025 01:26:52 +0000 (11:26 +1000)]
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git