Skip to content

Commit

Permalink
Merge pull request #937 from kernelkit/update-kernel
Browse files Browse the repository at this point in the history
Update linux kernel to 6.12.13 (LTS)
  • Loading branch information
wkz authored Feb 11, 2025
2 parents 343c465 + 3203ee9 commit d3bfbb5
Show file tree
Hide file tree
Showing 43 changed files with 464 additions and 371 deletions.
2 changes: 1 addition & 1 deletion configs/aarch64_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.11"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.13"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
Expand Down
2 changes: 1 addition & 1 deletion configs/aarch64_minimal_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.11"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.13"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
Expand Down
2 changes: 1 addition & 1 deletion configs/x86_64_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.11"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.13"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
Expand Down
2 changes: 1 addition & 1 deletion configs/x86_64_minimal_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.11"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.13"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ All notable changes to the project are documented in this file.
-------------------------

### Changes
- Upgrade Linux kernel to 6.12.13 (LTS)
- YANG type for SSH private/public keys has changed, from
ietf-crypto-types to infix-crypto-types

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 998f0e99f2bd7ab54e1d25acac4227335c8caaec Mon Sep 17 00:00:00 2001
From 773a0e32210336d682148e2e4c87add5e69105ec Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 12 Mar 2024 10:27:24 +0100
Subject: [PATCH 01/25] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for
PPU on 6393X
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

In a multi-chip setup, delays of up to 750ms are observed before the
device (6393X) signals completion of PPU initialization (Global 1,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 3002b9e08272f3d740c2b582cf9b01fa1fde46b8 Mon Sep 17 00:00:00 2001
From 765cc95de163acf8022b093ce227184e04b49d7b Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 27 Mar 2024 15:52:43 +0100
Subject: [PATCH 02/25] net: dsa: mv88e6xxx: Improve indirect register access
perf on 6393
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

When operating in multi-chip mode, the 6393 family maps a subset of
commonly used global registers to the outermost address space (in
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 6bad36ecd3bb8f9b97c51f8ee2409f250344c1fc Mon Sep 17 00:00:00 2001
From eb1ba5920254e04daff5c9a09e90b8882bf34490 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Mon, 22 Apr 2024 23:18:01 +0200
Subject: [PATCH 03/25] net: dsa: mv88e6xxx: Honor ports being managed via
in-band-status
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Keep all link parameters in their unforced states when the port is
declared as being managed via in-band-status, and let the MAC
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 980366a1f8709fdfe643edb666c86a916c681a6c Mon Sep 17 00:00:00 2001
From 8b3590e253746d5704650889c106cf5454e26cd3 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 24 Apr 2024 22:41:04 +0200
Subject: [PATCH 04/25] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
ports on 6393X
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

For packets with a DA in the IEEE reserved L2 group range, originating
from a CPU, forward it as normal, rather than classifying it as
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From cfc55d98057160753158b7c5357c94ac24d918fe Mon Sep 17 00:00:00 2001
From 3c13e341f9e18cdd819584086bed0d207a3f042a Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Thu, 16 Nov 2023 19:44:32 +0100
Subject: [PATCH 05/25] net: dsa: mv88e6xxx: Add LED infrastructure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Parse DT for LEDs and register them for devices that support it,
though no actual implementations exist yet.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 180f2b90c73bc9fdfb27335327571daf8507f9c8 Mon Sep 17 00:00:00 2001
From eb8d96aab3ee81c40252f8c5e1628b3709e23cab Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Thu, 16 Nov 2023 21:59:35 +0100
Subject: [PATCH 06/25] net: dsa: mv88e6xxx: Add LED support for 6393X
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Trigger support:
- "none"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 2e42839d4edb250b298f7683975382e9ec97c9a9 Mon Sep 17 00:00:00 2001
From 06a7be8d8ca0241b89504595b0838ecf25b6c768 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 28 May 2024 10:38:42 +0200
Subject: [PATCH 07/25] net: dsa: tag_dsa: Use tag priority as initial
skb->priority
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Use the 3-bit priority field from the DSA tag as the initial packet
priority on ingress to the CPU.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 681fc63548bae02cd286042a3470011617ff78fd Mon Sep 17 00:00:00 2001
From 0312ac7f2a3d956ff9aec3f84b3b64302e59d36c Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 16 Jan 2024 16:00:55 +0100
Subject: [PATCH 08/25] net: dsa: Support MDB memberships whose L2 addresses
overlap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Multiple IP multicast groups (32 for v4, 2^80 for v6) map to the same
L2 address. This means that switchdev drivers may receive multiple MDB
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From d1c7aeac75ffe6e1350d8a08ee9ba99209636df5 Mon Sep 17 00:00:00 2001
From 45716feb5762311a384f38d8b6449fc652a73764 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Thu, 21 Mar 2024 19:12:15 +0100
Subject: [PATCH 09/25] net: dsa: Support EtherType based priority overrides
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Signed-off-by: Mattias Walström <[email protected]>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 79d68d69f6cd6cf57ef5ed4bcba45134ff8ba174 Mon Sep 17 00:00:00 2001
From d2802357f81b4995c92fdd6f2ab8ea923b69cef1 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Fri, 22 Mar 2024 16:15:43 +0100
Subject: [PATCH 10/25] net: dsa: mv88e6xxx: Support EtherType based priority
overrides
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Signed-off-by: Mattias Walström <[email protected]>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 57eabbff1169a5641c59fc698d7b122d17733d49 Mon Sep 17 00:00:00 2001
From 985f9b471326f65d2c29978b511181200c1b32dd Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 28 May 2024 11:04:22 +0200
Subject: [PATCH 11/25] net: dsa: mv88e6xxx: Add mqprio qdisc support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Add support for attaching mqprio qdisc's to mv88e6xxx ports and use
the packet's traffic class as the outgoing priority when no PCP bits
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 752cce791dfe31525e3974d6f6419e4be0535343 Mon Sep 17 00:00:00 2001
From da95446b056b1efc27353d2549298580978a079f Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 29 May 2024 13:20:41 +0200
Subject: [PATCH 12/25] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
are available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Switch the priority sourcing precdence to prefer VLAN PCP over IP
DSCP, when both are available.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From b3b9b97cbe4eebd6cd3d68744e11a1bde5b98a47 Mon Sep 17 00:00:00 2001
From e4a71c66724ba89a37dee71db5ae9e555676547e Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 26 Nov 2024 19:45:59 +0100
Subject: [PATCH 13/25] [FIX] net: dsa: mv88e6xxx: Trap locally terminated
VLANs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Before this change, in a setup like the following, packets assigned to
VLAN 10 were forwarded between the switch ports, even though the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 1e19f28f4f44973f349ad8bbb2fe0f4624e3c0f3 Mon Sep 17 00:00:00 2001
From 9ade37c2fa9f5a6faebeaa8894d9703624eae5ef Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 19 Sep 2023 18:38:10 +0200
Subject: [PATCH 14/25] net: phy: marvell10g: Support firmware loading on
88X3310
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

When probing, if a device is waiting for firmware to be loaded into
its RAM, ask userspace for the binary and load it over XMDIO.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 95ff23729224c6c08801c2dba8830b18c177431b Mon Sep 17 00:00:00 2001
From 9571b0e79717fbcef4540b9a20a4fb2fe4c57f26 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 21 Nov 2023 20:15:24 +0100
Subject: [PATCH 15/25] net: phy: marvell10g: Fix power-up when strapped to
start powered down
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

On devices which are hardware strapped to start powered down (PDSTATE
== 1), make sure that we clear the power-down bit on all units
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From ecdfc7324dd50d79c81af453699467023d72e2bf Mon Sep 17 00:00:00 2001
From 05a6f49a221e797fdbd21501902bd969b9c64640 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 15 Nov 2023 20:58:42 +0100
Subject: [PATCH 16/25] net: phy: marvell10g: Add LED support for 88X3310
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Pickup the LEDs from the state in which the hardware reset or
bootloader left them, but also support further configuration via
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From df3d8aede0c04a0ae93e0dc02ba6b471e3791500 Mon Sep 17 00:00:00 2001
From 202a7fccb4d46e38ed6f82788a44cf7320377549 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Tue, 12 Dec 2023 09:51:05 +0100
Subject: [PATCH 17/25] net: phy: marvell10g: Support LEDs tied to a single
media side
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

In a combo-port setup, i.e. where both the copper and fiber interface
are available to the user, the LEDs may be physically located either
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From f76443118313f681a62cf34a6f8b38f743832dff Mon Sep 17 00:00:00 2001
From 31f2aa0e957643cc51be65750c4f65be8c507a18 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Wed, 27 Mar 2024 10:10:19 +0100
Subject: [PATCH 18/25] net: phy: Do not resume PHY when attaching
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

The PHY should not start negotiating with its link-partner until
explicitly instructed to do so.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From cd73e20a5c51dc26ab6a768a813ab805ad8b0689 Mon Sep 17 00:00:00 2001
From 83c259d997fa40f0b9b9a3250746531df9c730c3 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <[email protected]>
Date: Mon, 4 Mar 2024 16:47:28 +0100
Subject: [PATCH 19/25] net: bridge: avoid classifying unknown multicast as
mrouters_only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Unknown multicast, MAC/IPv4/IPv6, should always be flooded according to
the per-port mcast_flood setting, as well as to detected and configured
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From ed61171f9f5d42000b7315d8af12691bb02dac35 Mon Sep 17 00:00:00 2001
From f2d2f489eb2073e79d3908a4f9abe797ce5c5a17 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <[email protected]>
Date: Tue, 5 Mar 2024 06:44:41 +0100
Subject: [PATCH 20/25] net: bridge: Ignore router ports when forwarding L2
multicast
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Multicast router ports are either statically configured or learned from
control protocol traffic (IGMP/MLD/PIM). These protocols regulate IP
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From 73702e1c0331ef8644f326f2dc155a73749cb1c5 Mon Sep 17 00:00:00 2001
From 4a88856e21984b9292361ad77d7dfc13fad239a5 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <[email protected]>
Date: Thu, 4 Apr 2024 16:36:30 +0200
Subject: [PATCH 21/25] net: bridge: drop delay for applying strict multicast
filtering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

This *local* patch drops the initial delay before applying strict multicast
filtering, introduced in [1] and recently updated in [2].
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From a48795ef7dbcfd7f1921753ad943144b933020b0 Mon Sep 17 00:00:00 2001
From 12fe155cedae381d143a0b61b5375d1edb7c46e6 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Thu, 16 May 2024 14:51:54 +0200
Subject: [PATCH 22/25] net: bridge: Differentiate MDB additions from
modifications
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Before this change, the reception of an IGMPv3 report (and analogously
for MLDv2) that adds a new group, would trigger two MDB RTM_NEWMDB
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From f0bbef0a94ed2e00475036b25dac8746e061c114 Mon Sep 17 00:00:00 2001
From d8d81ca2a348095d87110d3d6a65134f1b7ce212 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <[email protected]>
Date: Fri, 24 Nov 2023 23:29:55 +0100
Subject: [PATCH 23/25] nvmem: layouts: onie-tlv: Let device probe even when
TLV is invalid
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

Before this change, probing an NVMEM device, expected to contain a
valid TLV, would fail if it had not been provisioned yet. But an
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 7135f0ab4f04b5cea7a0b67df0fe91f925ef19df Mon Sep 17 00:00:00 2001
From 49592053a901870104c3ea6f6d4a4c18711c955d Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <[email protected]>
Date: Mon, 29 Apr 2024 15:14:51 +0200
Subject: [PATCH 24/25] usb: core: adjust log level for unauthorized devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Organization: Addiva Elektronik
Organization: Wires

The fact that a USB device currently is not authorized is not an error,
so let's adjust the log level so these messages slip below radar for the
Expand Down
Loading

0 comments on commit d3bfbb5

Please sign in to comment.