Skip to content

Commit 6d53d92

Browse files
authored
Merge pull request #1050 from kernelkit/upgrade-buildroot
Upgrade Buildroot to 2025.02.3 (LTS)
2 parents 8b9a452 + e0696c4 commit 6d53d92

4 files changed

+8
-7
lines changed

buildroot

Submodule buildroot updated 375 files

doc/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ All notable changes to the project are documented in this file.
66
[v25.05.0][UNRELEASED]
77
-------------------------
88
### Changes
9+
- Upgrade Buildroot to 2025.02.3 (LTS)
910
- Upgrade Linux kernel to 6.12.30 (LTS)
1011
- Upgrade libyang to 3.12.2
1112
- Upgrade sysrepo to 3.6.11

patches/iproute2/6.13.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch renamed to patches/iproute2/6.14.0/0001-iplink_bridge-add-mcast_flood_always-bridge-option.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From dfd52e38ab402822aa4011039efa00e9d183d6a6 Mon Sep 17 00:00:00 2001
1+
From 392735fcb41b303b6dbe3517fab9ba734ff2e288 Mon Sep 17 00:00:00 2001
22
From: Joachim Wiberg <troglobit@gmail.com>
33
Date: Tue, 5 Mar 2024 09:41:46 +0100
44
Subject: [PATCH 1/2] iplink_bridge: add mcast_flood_always bridge option
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
1717
3 files changed, 32 insertions(+)
1818

1919
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
20-
index c206cf6d..84ef4233 100644
20+
index c206cf6..84ef423 100644
2121
--- a/include/uapi/linux/if_bridge.h
2222
+++ b/include/uapi/linux/if_bridge.h
2323
@@ -830,6 +830,7 @@ enum br_boolopt_id {
@@ -29,7 +29,7 @@ index c206cf6d..84ef4233 100644
2929
};
3030

3131
diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
32-
index f01ffe15..2a489b7b 100644
32+
index 1fe8955..d4f2c80 100644
3333
--- a/ip/iplink_bridge.c
3434
+++ b/ip/iplink_bridge.c
3535
@@ -41,6 +41,7 @@ static void print_explain(FILE *f)
@@ -80,10 +80,10 @@ index f01ffe15..2a489b7b 100644
8080

8181
if (tb[IFLA_BR_MCAST_ROUTER])
8282
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
83-
index eabca490..ba0a5304 100644
83+
index efb6248..2308835 100644
8484
--- a/man/man8/ip-link.8.in
8585
+++ b/man/man8/ip-link.8.in
86-
@@ -1703,6 +1703,8 @@ the following additional arguments are supported:
86+
@@ -1712,6 +1712,8 @@ the following additional arguments are supported:
8787
] [
8888
.BI vlan_stats_per_port " VLAN_STATS_PER_PORT "
8989
] [
@@ -92,7 +92,7 @@ index eabca490..ba0a5304 100644
9292
.BI mcast_snooping " MULTICAST_SNOOPING "
9393
] [
9494
.BI mcast_vlan_snooping " MULTICAST_VLAN_SNOOPING "
95-
@@ -1851,6 +1853,16 @@ or disable
95+
@@ -1860,6 +1862,16 @@ or disable
9696
.RI ( VLAN_STATS_PER_PORT " == 0) "
9797
per-VLAN per-port stats accounting. Can be changed only when there are no port VLANs configured.
9898

0 commit comments

Comments
 (0)