diff --git a/Patchlist.changelog b/Patchlist.changelog index c2151746a..67c807649 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,21 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/338f45a28efdfb7b01659662434fe7e4a21db681 + 338f45a28efdfb7b01659662434fe7e4a21db681 net: macb: Fix tx/rx malfunction after phy link down and up + +https://gitlab.com/cki-project/kernel-ark/-/commit/29d4af45ee481b48ee077c6fc5078efcdb915b75 + 29d4af45ee481b48ee077c6fc5078efcdb915b75 net: macb: Replace open-coded device config retrieval with of_device_get_match_data() + +https://gitlab.com/cki-project/kernel-ark/-/commit/65490d1d05e842782d1a5027aed37cd2b67b8166 + 65490d1d05e842782d1a5027aed37cd2b67b8166 net: macb: convert to use .get_rx_ring_count + +https://gitlab.com/cki-project/kernel-ark/-/commit/f60528b7231c389c8f29e1172f3b0cbc33ed0ea0 + f60528b7231c389c8f29e1172f3b0cbc33ed0ea0 net: cadence: macb: Discard pm_runtime_put() return value + +https://gitlab.com/cki-project/kernel-ark/-/commit/c7dfb6ce47f1e133cb7cf5bb651c028b8edd81e0 + c7dfb6ce47f1e133cb7cf5bb651c028b8edd81e0 arm64: dts: broadcom: bcm2712: Add watchdog DT node + +https://gitlab.com/cki-project/kernel-ark/-/commit/9e557cd3469d512fcd01dbd0b55d04ad31e7c074 + 9e557cd3469d512fcd01dbd0b55d04ad31e7c074 arm64: dts: broadcom: bcm2712: Enable RNG + https://gitlab.com/cki-project/kernel-ark/-/commit/51aea5706fc6381678afaa1efcb2ac922d2b4dca 51aea5706fc6381678afaa1efcb2ac922d2b4dca media: ipu-bridge: Add upside-down sensor DMI quirk for Dell XPS 13 9340 and XPS 14 9440 diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 614f8a47d..6d9052d1f 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -3761,7 +3761,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index ffdc626af..196e904b9 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -3743,7 +3743,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index b488eb4a6..8abf70c7c 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3761,7 +3761,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 6257764df..f64a70512 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3743,7 +3743,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-aarch64-rt-64k-debug-fedora.config b/kernel-aarch64-rt-64k-debug-fedora.config index b879d170c..df9d8a540 100644 --- a/kernel-aarch64-rt-64k-debug-fedora.config +++ b/kernel-aarch64-rt-64k-debug-fedora.config @@ -3769,7 +3769,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-aarch64-rt-64k-fedora.config b/kernel-aarch64-rt-64k-fedora.config index 2dc35f927..2cdf1e1d1 100644 --- a/kernel-aarch64-rt-64k-fedora.config +++ b/kernel-aarch64-rt-64k-fedora.config @@ -3751,7 +3751,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 473c5be45..9aecb9990 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -3766,7 +3766,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index 368ce33f6..bff469dd9 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -3748,7 +3748,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index d00ba4e2a..eedd48dac 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2960,7 +2960,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 61fe3313e..1c373f39b 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2940,7 +2940,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 8d649c119..13112f701 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -2999,7 +2999,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index c965e019b..3deb9a1fb 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -2979,7 +2979,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index 5637e604b..e37efe1f0 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -3004,7 +3004,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index 6db74ae8e..cb62ad2c6 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -2984,7 +2984,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index ea660edd4..608bba3bf 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3231,7 +3231,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 445538c27..b17d977b7 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3211,7 +3211,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 184aa15d9..23bd00b2b 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -3236,7 +3236,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index eb55161a5..b73bfc8ac 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -3216,7 +3216,7 @@ CONFIG_INPUT_E3X0_BUTTON=m # CONFIG_INPUT_EVBUG is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_FF_MEMLESS=m -# CONFIG_INPUT_GPIO_BEEPER is not set +CONFIG_INPUT_GPIO_BEEPER=m # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_VIBRA=m diff --git a/kernel.changelog b/kernel.changelog index 5a7f92b60..48765bfd9 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,15 @@ +* Wed Mar 04 2026 Justin M. Forbes [6.19.6-0] +- net: macb: Fix tx/rx malfunction after phy link down and up (Kevin Hao) +- net: macb: Replace open-coded device config retrieval with of_device_get_match_data() (Kevin Hao) +- net: macb: convert to use .get_rx_ring_count (Breno Leitao) +- net: cadence: macb: Discard pm_runtime_put() return value (Rafael J. Wysocki) +- arm64: dts: broadcom: bcm2712: Add watchdog DT node (Stanimir Varbanov) +- arm64: dts: broadcom: bcm2712: Enable RNG (Peter Robinson) +- fedora: minor beeper cleanups (Peter Robinson) +- Add config introduced in 6.19.4 (Justin M. Forbes) +- Linux v6.19.6 +Resolves: + * Fri Feb 27 2026 Justin M. Forbes [6.19.5-0] - Linux v6.19.5 Resolves: diff --git a/kernel.spec b/kernel.spec index 2ed31e622..be1f46c1d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -184,18 +184,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.19.5 -%define specversion 6.19.5 +%define specrpmversion 6.19.6 +%define specversion 6.19.6 %define patchversion 6.19 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.19.5 +%define tarfile_release 6.19.6 # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.19.5 +%define kabiversion 6.19.6 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4811,8 +4811,19 @@ fi\ # # %changelog -* Fri Feb 27 2026 Justin M. Forbes [6.19.5-300] +* Wed Mar 04 2026 Justin M. Forbes [6.19.6-300] +- Turn on release_targets for F43/F42 (Justin M. Forbes) + +* Wed Mar 04 2026 Justin M. Forbes [6.19.6-0] +- net: macb: Fix tx/rx malfunction after phy link down and up (Kevin Hao) +- net: macb: Replace open-coded device config retrieval with of_device_get_match_data() (Kevin Hao) +- net: macb: convert to use .get_rx_ring_count (Breno Leitao) +- net: cadence: macb: Discard pm_runtime_put() return value (Rafael J. Wysocki) +- arm64: dts: broadcom: bcm2712: Add watchdog DT node (Stanimir Varbanov) +- arm64: dts: broadcom: bcm2712: Enable RNG (Peter Robinson) +- fedora: minor beeper cleanups (Peter Robinson) - Add config introduced in 6.19.4 (Justin M. Forbes) +- Linux v6.19.6 * Fri Feb 27 2026 Justin M. Forbes [6.19.5-0] - Linux v6.19.5 diff --git a/patch-6.19-redhat.patch b/patch-6.19-redhat.patch index eb0fdd631..aa85aa675 100644 --- a/patch-6.19-redhat.patch +++ b/patch-6.19-redhat.patch @@ -1,6 +1,7 @@ Makefile | 30 +++++ arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 2 +- + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 15 +++ arch/arm64/kernel/setup.c | 27 +++++ arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + @@ -25,6 +26,7 @@ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- drivers/iommu/iommu.c | 22 ++++ drivers/media/pci/intel/ipu-bridge.c | 14 +++ + drivers/net/ethernet/cadence/macb_main.c | 29 ++--- drivers/pci/quirks.c | 24 ++++ drivers/scsi/sd.c | 10 ++ drivers/usb/core/hub.c | 7 ++ @@ -41,10 +43,10 @@ security/lockdown/lockdown.c | 11 ++ tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 ------ - 43 files changed, 559 insertions(+), 220 deletions(-) + 45 files changed, 590 insertions(+), 233 deletions(-) diff --git a/Makefile b/Makefile -index f486050e0bee4..3af5f02848e7e 100644 +index 67f26d8b29343..d1f4007b07369 100644 --- a/Makefile +++ b/Makefile @@ -355,6 +355,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) @@ -127,6 +129,39 @@ index 93173f0a09c7d..8f992962ccd35 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs +diff --git a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi +index 205b87f557d6d..d57a9b1bff70c 100644 +--- a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi ++++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi +@@ -250,6 +250,15 @@ uart10: serial@7d001000 { + status = "disabled"; + }; + ++ pm: watchdog@7d200000 { ++ compatible = "brcm,bcm2712-pm", "brcm,bcm2835-pm-wdt"; ++ reg = <0x7d200000 0x604>; ++ reg-names = "pm"; ++ #power-domain-cells = <1>; ++ #reset-cells = <1>; ++ system-power-controller; ++ }; ++ + pinctrl: pinctrl@7d504100 { + compatible = "brcm,bcm2712c0-pinctrl"; + reg = <0x7d504100 0x30>; +@@ -283,6 +292,12 @@ pinctrl_aon: pinctrl@7d510700 { + reg = <0x7d510700 0x20>; + }; + ++ random: rng@7d208000 { ++ compatible = "brcm,bcm2711-rng200"; ++ reg = <0x7d208000 0x28>; ++ status = "okay"; ++ }; ++ + interrupt-controller@7d517000 { + compatible = "brcm,bcm7271-l2-intc"; + reg = <0x7d517000 0x10>; diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 23c05dc7a8f2a..d7b7b2f39e169 100644 --- a/arch/arm64/kernel/setup.c @@ -227,7 +262,7 @@ index c1fe0b53c5ac5..8e17bfe788cb9 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 1b2edd07a3e17..1c434c6900ebe 100644 +index 383d4a4784f5b..45f428436e2d9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -21,6 +21,7 @@ @@ -238,7 +273,7 @@ index 1b2edd07a3e17..1c434c6900ebe 100644 #include #include #include -@@ -991,6 +992,13 @@ void __init setup_arch(char **cmdline_p) +@@ -997,6 +998,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -252,7 +287,7 @@ index 1b2edd07a3e17..1c434c6900ebe 100644 reserve_ibft_region(); x86_init.resources.dmi_setup(); -@@ -1154,19 +1162,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1160,19 +1168,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -474,10 +509,10 @@ index d1595156c86a4..9485212f1a6d6 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 416d87f9bd107..cb563be2b69c1 100644 +index b78f6be2f9468..8bf534f6f8933 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1802,6 +1802,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1803,6 +1803,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, ignore_serial_bus_ids)) return false; @@ -1192,11 +1227,87 @@ index b2b710094914c..fd3c46aa0350e 100644 { .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Dell Inc."), +diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c +index 4ebb40adfab37..43cd013bb70e6 100644 +--- a/drivers/net/ethernet/cadence/macb_main.c ++++ b/drivers/net/ethernet/cadence/macb_main.c +@@ -3849,6 +3849,13 @@ static int gem_get_all_flow_entries(struct net_device *netdev, + return 0; + } + ++static u32 gem_get_rx_ring_count(struct net_device *netdev) ++{ ++ struct macb *bp = netdev_priv(netdev); ++ ++ return bp->num_queues; ++} ++ + static int gem_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, + u32 *rule_locs) + { +@@ -3856,9 +3863,6 @@ static int gem_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, + int ret = 0; + + switch (cmd->cmd) { +- case ETHTOOL_GRXRINGS: +- cmd->data = bp->num_queues; +- break; + case ETHTOOL_GRXCLSRLCNT: + cmd->rule_cnt = bp->rx_fs_list.count; + break; +@@ -3940,6 +3944,7 @@ static const struct ethtool_ops gem_ethtool_ops = { + .set_ringparam = macb_set_ringparam, + .get_rxnfc = gem_get_rxnfc, + .set_rxnfc = gem_set_rxnfc, ++ .get_rx_ring_count = gem_get_rx_ring_count, + }; + + static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +@@ -4810,7 +4815,9 @@ static int at91ether_close(struct net_device *dev) + + at91ether_stop(lp); + +- return pm_runtime_put(&lp->pdev->dev); ++ pm_runtime_put(&lp->pdev->dev); ++ ++ return 0; + } + + /* Transmit packet */ +@@ -5430,9 +5437,9 @@ static const struct macb_config default_gem_config = { + + static int macb_probe(struct platform_device *pdev) + { +- const struct macb_config *macb_config = &default_gem_config; +- struct device_node *np = pdev->dev.of_node; + struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL; ++ struct device_node *np = pdev->dev.of_node; ++ const struct macb_config *macb_config; + struct clk *tsu_clk = NULL; + phy_interface_t interface; + struct net_device *dev; +@@ -5448,13 +5455,9 @@ static int macb_probe(struct platform_device *pdev) + if (IS_ERR(mem)) + return PTR_ERR(mem); + +- if (np) { +- const struct of_device_id *match; +- +- match = of_match_node(macb_dt_ids, np); +- if (match && match->data) +- macb_config = match->data; +- } ++ macb_config = of_device_get_match_data(&pdev->dev); ++ if (!macb_config) ++ macb_config = &default_gem_config; + + err = macb_config->clk_init(pdev, &pclk, &hclk, &tx_clk, &rx_clk, &tsu_clk); + if (err) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 6df78efd7f6dc..46f79808ff257 100644 +index fd86f72f54aef..34dbf67c104b0 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4453,6 +4453,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4481,6 +4481,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); diff --git a/sources b/sources index 28f04ecc5..3e69e4bf5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.19.5.tar.xz) = 177aa5b1f7e1424ff8632787b8f901c4463717728cbace8a097f1c3926102d00a193b3a9888e3fdca3f80fe1148c33da62a1369b539f9a5a238ccfb85b4c9119 -SHA512 (kernel-abi-stablelists-6.19.5.tar.xz) = 807e2ee97676261106a89a0fdcd4545e3460b3cc95832329be6f265ae6bad4aacfcc4781b262da60ab85ced93ef337ee2ee0d6aacf45626c58e1abb641451490 -SHA512 (kernel-kabi-dw-6.19.5.tar.xz) = 6cf5e5cf282a962b79366dbb1845bab53bf836b4daf0b2eb14492365365aef3e412edea63f8e32d254d1d41f090ada17b835ae30b3a4890c284a0d3e15df0f24 +SHA512 (linux-6.19.6.tar.xz) = 93f896fe12f5155aa2cc1deea73dee0eebf09657b1a5b195cd960b4012ad0002c8620925e6869124edf80dfa50423b5731f0e9c037f8744b5ca8267949fa4d7b +SHA512 (kernel-abi-stablelists-6.19.6.tar.xz) = 532ca3f317af1efc08339ab28f38b6700a4e6c90f2f1526503858bea4ddaf17388dd3e555c4d7a6977fd1e02bd5e749bdae8eab9c5cb03fb7778bd4fd4ca591a +SHA512 (kernel-kabi-dw-6.19.6.tar.xz) = dd6ebbc436e8807fc4eca067e773de2db1ca0d31f1862a899271222df66ff099c1ead0627562049a687e331c576bf87845c292aa6534f7b8e7672789caccf7a3