Skip to content

Commit 898844e

Browse files
committed
feat: update Linux to 6.18.33
Drop one of the PCI patches, it has been backported as2d18cf09f2b07e116b53532fe20dc7020b01525b. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent a8dfbf7 commit 898844e

5 files changed

Lines changed: 5 additions & 102 deletions

File tree

Pkgfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ vars:
103103
kspp_sha512: 80f10aabe03c63da1ce4e382dc600fcb73ea2d5f14a931549bf5e540a8dd675aaa92fb8b3f18d3d219ef98f4243684f64859c4949151f5c4ee2929859ddf6d32
104104

105105
# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
106-
linux_version: 6.18.32
107-
linux_sha256: 067dadd445578284ea6158f312f7970d8940fed3e094dbe49cff66d188d3bda4
108-
linux_sha512: 28255844409e2be9181acf83d2ca1afe45ff4b405d20929d9b4b23c85e314d81f5e7177646a24bdc1747eee51b2f3e252bf1d189f625d0313d9f3d61e1eb7c0f
106+
linux_version: 6.18.33
107+
linux_sha256: 6f16ff302599f6fe34742890322cf0775703105fbd8767449682fca6af0fb782
108+
linux_sha512: 6d6f6c4f9c6ac7974f9cd15ff4569e00d5c6bda58c54f6164c4ceb3161269caa768cb6ec33b04d6ff723edf34e5d2ac70405d9c41bd6ddbbd97dda480b90a4f5
109109

110110
# renovate: datasource=git-tags extractVersion=^libaio-(?<version>.*)$ depName=https://pagure.io/libaio.git
111111
libaio_version: 0.3.113

kernel/build/config-amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 6.18.32 Kernel Configuration
3+
# Linux/x86 6.18.33 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="clang version 22.1.5"
66
CONFIG_GCC_VERSION=0

kernel/build/config-arm64

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.18.32 Kernel Configuration
3+
# Linux/arm64 6.18.33 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="clang version 22.1.5"
66
CONFIG_GCC_VERSION=0
@@ -2977,7 +2977,6 @@ CONFIG_NET_VENDOR_FREESCALE=y
29772977
# CONFIG_FSL_PQ_MDIO is not set
29782978
# CONFIG_FSL_XGMAC_MDIO is not set
29792979
# CONFIG_GIANFAR is not set
2980-
# CONFIG_FSL_DPAA2_SWITCH is not set
29812980
# CONFIG_FSL_ENETC is not set
29822981
# CONFIG_NXP_ENETC4 is not set
29832982
# CONFIG_FSL_ENETC_VF is not set

kernel/build/patches/0005-PCI-fix-premature-removal-realloc-head.patch

Lines changed: 0 additions & 95 deletions
This file was deleted.

kernel/build/patches/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
| `0002-net-macb-insert-PCIe-read-barrier-before-TX-completi.patch` | macb: insert non-destructive PCIe read barrier (`queue_readl(queue, IMR)`) before `macb_tx_complete_pending()` in `macb_tx_poll()`. Replaces the v1 ISR-read form which was destructive on read-clear silicon (RP1) — that read silently consumed RCOMP / ROVR / TXUBR bits, causing silent RX-completion loss at moderate-to-heavy load | v2 submitted to netdev | [v2 thread](https://lore.kernel.org/netdev/20260514215459.36109-1-lukasz@raczylo.com/T/) |
55
| `0003-net-macb-add-TX-stall-watchdog-to-recover-from-lost-.patch` | macb: per-queue `delayed_work` watchdog that calls `macb_tx_restart()` if tx_tail hasn't advanced. v2 uses a `bool tx_stall_tail_moved` flag (pelwell-suggested form) instead of a tx_tail snapshot, gates the check on `netif_carrier_ok()` to eliminate a boot-time false positive, and wraps the stall-warn in `if (printk_ratelimit()) netdev_warn(...)` so events stay observable while bounded | v2 submitted to netdev | [v2 thread](https://lore.kernel.org/netdev/20260514215459.36109-1-lukasz@raczylo.com/T/) · [v2 patch 3 build-fix](https://lore.kernel.org/netdev/20260515095336.92237-1-lukasz@raczylo.com/T/) |
66
| `0004-PCI-prevent-shrink-bridge-window.patch` | PCI: prevent `adjust_bridge_window()` from shrinking a bridge window below the size required by `pbus_size_mem()` — fixes large-BAR / eGPU resource starvation | Merged to mainline v6.19, candidate for 6.18.y stable backport | [lore patch](https://patch.msgid.link/20260219153951.68869-1-ilpo.jarvinen@linux.intel.com) |
7-
| `0005-PCI-fix-premature-removal-realloc-head.patch` | PCI: reorder checks in `reassign_resources_sorted()` so entries aren't dropped from `realloc_head` before being processed — preserves `add_size` for deeper PCI hierarchy levels | Merged to mainline v6.19, candidate for 6.18.y stable backport | [lore patch](https://patch.msgid.link/20260313084551.1934-1-ilpo.jarvinen@linux.intel.com) |

0 commit comments

Comments
 (0)