Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update Linux to 6.12 #1085

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Conversation

smira
Copy link
Member

@smira smira commented Nov 18, 2024

  • Linux: 6.12.1
  • drbd: 9.2.12
  • NVIDIA: minor bumps
  • ZFS: main version (temporary)

Current status:

  • drbd new release builds without issues
  • ZFS only main builds (no release upstream)
  • gasket driver build with patches
  • NVIDIA needs patches

@smira smira force-pushed the feat/linux-6.12 branch 3 times, most recently from 26fe968 to 8171431 Compare November 25, 2024 09:34
kernel/build/config-amd64 Outdated Show resolved Hide resolved
@smira
Copy link
Member Author

smira commented Nov 25, 2024

--- modules.6.6	2024-11-25 13:51:29.745524139 +0400
+++ modules.6.12	2024-11-25 13:51:41.742576428 +0400
@@ -218,6 +218,10 @@
 ./kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
 ./kernel/drivers/net/ethernet/intel/ixgbevf
 ./kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
+./kernel/drivers/net/ethernet/intel/libeth
+./kernel/drivers/net/ethernet/intel/libeth/libeth.ko
+./kernel/drivers/net/ethernet/intel/libie
+./kernel/drivers/net/ethernet/intel/libie/libie.ko
 ./kernel/drivers/net/ethernet/marvell
 ./kernel/drivers/net/ethernet/marvell/sky2.ko
 ./kernel/drivers/net/ethernet/mellanox
@@ -293,6 +297,8 @@
 ./kernel/drivers/net/vmxnet3/vmxnet3.ko
 ./kernel/drivers/net/vrf.ko
 ./kernel/drivers/nvme
+./kernel/drivers/nvme/common
+./kernel/drivers/nvme/common/nvme-auth.ko
 ./kernel/drivers/nvme/host
 ./kernel/drivers/nvme/host/nvme.ko
 ./kernel/drivers/nvme/host/nvme-rdma.ko
@@ -395,4 +401,4 @@
 ./modules.symbols.bin
 ./modules.weakdep
 
-136 directories, 260 files
+139 directories, 263 files

@dsseng
Copy link
Member

dsseng commented Nov 25, 2024

All look necessary to be included into base image. nvme-auth is pulled by nvme core subsystem, so needed even if no fiber transport is in use.

--- modules.6.6	2024-11-25 13:51:29.745524139 +0400
+++ modules.6.12	2024-11-25 13:51:41.742576428 +0400
@@ -218,6 +218,10 @@
 ./kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
 ./kernel/drivers/net/ethernet/intel/ixgbevf
 ./kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
+./kernel/drivers/net/ethernet/intel/libeth
+./kernel/drivers/net/ethernet/intel/libeth/libeth.ko
+./kernel/drivers/net/ethernet/intel/libie
+./kernel/drivers/net/ethernet/intel/libie/libie.ko
 ./kernel/drivers/net/ethernet/marvell
 ./kernel/drivers/net/ethernet/marvell/sky2.ko
 ./kernel/drivers/net/ethernet/mellanox
@@ -293,6 +297,8 @@
 ./kernel/drivers/net/vmxnet3/vmxnet3.ko
 ./kernel/drivers/net/vrf.ko
 ./kernel/drivers/nvme
+./kernel/drivers/nvme/common
+./kernel/drivers/nvme/common/nvme-auth.ko
 ./kernel/drivers/nvme/host
 ./kernel/drivers/nvme/host/nvme.ko
 ./kernel/drivers/nvme/host/nvme-rdma.ko
@@ -395,4 +401,4 @@
 ./modules.symbols.bin
 ./modules.weakdep
 
-136 directories, 260 files
+139 directories, 263 files

nonfree/kmod-nvidia/lts/pkg.yaml Outdated Show resolved Hide resolved
nonfree/kmod-nvidia/production/pkg.yaml Outdated Show resolved Hide resolved
nvidia-open-gpu-kernel-modules/lts/pkg.yaml Outdated Show resolved Hide resolved
@smira smira marked this pull request as ready for review November 26, 2024 10:14
* Linux: 6.12.1
* drbd: 9.2.12
* NVIDIA: minor bumps
* ZFS: `main` version (temporary)

Signed-off-by: Andrey Smirnov <[email protected]>
@smira
Copy link
Member Author

smira commented Nov 26, 2024

/m

@talos-bot talos-bot merged commit 653d423 into siderolabs:main Nov 26, 2024
14 checks passed
smira added a commit to smira/extensions that referenced this pull request Nov 27, 2024
Matching updates for siderolabs/pkgs#1085

Signed-off-by: Andrey Smirnov <[email protected]>
smira added a commit to smira/extensions that referenced this pull request Nov 27, 2024
Matching updates for siderolabs/pkgs#1085

Signed-off-by: Andrey Smirnov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants