LIBRE_REV = 1
-LINUX_VERSION-5.10 = .176
-LINUX_KERNEL_HASH-5.10.176 = 684a21f45cab746068da2cf0871e94764d1538d9aae43b6acc6cba8f3b14ca4a
+LINUX_VERSION-5.10 = .179
+LINUX_KERNEL_HASH-5.10.179 = d76270b9fdbf101b461ec000a796cf9d0db092a9c3e71da265e38dc33fedadb1
if (bgmac->irq < 0)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
-@@ -4480,7 +4480,6 @@ static int macb_probe(struct platform_de
+@@ -4484,7 +4484,6 @@ static int macb_probe(struct platform_de
struct net_device *dev;
struct resource *regs;
void __iomem *mem;
struct macb *bp;
int err, val;
-@@ -4593,15 +4592,11 @@ static int macb_probe(struct platform_de
+@@ -4597,15 +4596,11 @@ static int macb_probe(struct platform_de
if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR)
bp->rx_intr_mask |= MACB_BIT(RXUBR);
int irq;
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5015,7 +5015,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -5019,7 +5019,7 @@ int stmmac_dvr_probe(struct device *devi
priv->wol_irq = res->wol_irq;
priv->lpi_irq = res->lpi_irq;
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/io.h>
-@@ -228,11 +229,65 @@ static const struct b53_io_ops b53_mmap_
- .write64 = b53_mmap_write64,
+@@ -242,11 +243,65 @@ static const struct b53_io_ops b53_mmap_
+ .phy_write16 = b53_mmap_phy_write16,
};
+static int b53_mmap_probe_of(struct platform_device *pdev,
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -2352,6 +2352,13 @@ config UNUSED_KSYMS_WHITELIST
+@@ -2364,6 +2364,13 @@ config UNUSED_KSYMS_WHITELIST
one per line. The path can be absolute, or relative to the kernel
source tree.
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -2384,7 +2384,7 @@ config PADATA
+@@ -2396,7 +2396,7 @@ config PADATA
bool
config ASN1
__le64 signature;
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
-@@ -334,7 +334,11 @@ static void mtdblock_remove_dev(struct m
+@@ -338,7 +338,11 @@ static void mtdblock_remove_dev(struct m
static struct mtd_blktrans_ops mtdblock_tr = {
.name = "mtdblock",
.major = MTD_BLOCK_MAJOR,
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2663,6 +2663,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -2668,6 +2668,9 @@ static int mv88e6xxx_setup_port(struct m
if (dsa_is_cpu_port(ds, port))
reg = 0;
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2725,6 +2725,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2726,6 +2726,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
-@@ -2856,16 +2860,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2857,16 +2861,6 @@ static inline struct sk_buff *dev_alloc_
}
+MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -3071,6 +3071,7 @@ int wake_up_state(struct task_struct *p,
+@@ -3074,6 +3074,7 @@ int wake_up_state(struct task_struct *p,
{
return try_to_wake_up(p, state, 0);
}
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1389,6 +1389,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+@@ -1401,6 +1401,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1192,6 +1192,73 @@ static struct mtd_info * __init open_mtd
+@@ -1201,6 +1201,73 @@ static struct mtd_info * __init open_mtd
return mtd;
}
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1275,6 +1342,12 @@ static int __init ubi_init(void)
+@@ -1284,6 +1351,12 @@ static int __init ubi_init(void)
}
}
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2691,7 +2691,7 @@ static inline int pskb_network_may_pull(
+@@ -2692,7 +2692,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -861,6 +861,7 @@ struct sk_buff {
+@@ -862,6 +862,7 @@ struct sk_buff {
__u8 decrypted:1;
#endif
__u8 scm_io_uring:1;
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2881,6 +2881,7 @@ static int mv88e6xxx_setup(struct dsa_sw
+@@ -2886,6 +2886,7 @@ static int mv88e6xxx_setup(struct dsa_sw
chip->ds = ds;
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -5450,6 +5450,7 @@ static int mv88e6xxx_register_switch(str
+@@ -5455,6 +5455,7 @@ static int mv88e6xxx_register_switch(str
ds->ops = &mv88e6xxx_switch_ops;
ds->ageing_time_min = chip->info->age_time_coeff;
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1805,6 +1805,15 @@ config EMBEDDED
+@@ -1817,6 +1817,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
-@@ -84,12 +84,23 @@
+@@ -90,12 +90,23 @@
};
};
fixed-link {
speed = <1000>;
-@@ -103,6 +114,9 @@
+@@ -109,6 +120,9 @@
pinctrl-0 = <&ge1_rgmii_pins>;
status = "okay";
phy-mode = "rgmii";
fixed-link {
speed = <1000>;
-@@ -115,6 +129,9 @@
+@@ -121,6 +135,9 @@
status = "okay";
phy-mode = "sgmii";
phy = <&phy1>;
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
-@@ -129,6 +129,7 @@
+@@ -135,6 +135,7 @@
status = "okay";
phy-mode = "sgmii";
phy = <&phy1>;
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
-@@ -261,13 +261,18 @@
+@@ -267,13 +267,18 @@
/* Switch MV88E6176 at address 0x10 */
switch@10 {
ports {
#address-cells = <1>;
#size-cells = <0>;
-@@ -320,6 +325,11 @@
+@@ -336,6 +341,11 @@
marvell,function = "gpio";
};
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
-@@ -82,6 +82,24 @@
+@@ -88,6 +88,24 @@
};
};
};
};
&bm {
-@@ -126,10 +144,20 @@
+@@ -132,10 +150,20 @@
/* WAN port */
ð2 {
buffer-manager = <&bm>;
bm,pool-long = <2>;
bm,pool-short = <3>;
-@@ -195,7 +223,7 @@
+@@ -201,7 +229,7 @@
/* routed to PCIe2 connector (CN62A) */
};
#include "armada-385.dtsi"
/ {
-@@ -181,7 +182,115 @@
+@@ -187,7 +188,115 @@
reg = <0>;
/* STM32F0 command interface at address 0x2a */
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
-@@ -156,7 +156,7 @@
+@@ -162,7 +162,7 @@
*/
status = "okay";
phy-mode = "sgmii";
phys = <&comphy5 2>;
sfp = <&sfp>;
buffer-manager = <&bm>;
-@@ -387,9 +387,9 @@
+@@ -393,9 +393,9 @@
pinctrl-0 = <&mdio_pins>;
status = "okay";
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
-@@ -32,7 +32,8 @@
+@@ -38,7 +38,8 @@
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
-@@ -392,7 +392,8 @@
+@@ -398,7 +398,8 @@
status = "okay";
compatible = "ethernet-phy-ieee802.3-c22";
reg = <1>;
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
-@@ -189,15 +189,13 @@
+@@ -195,15 +195,13 @@
reg = <0x2b>;
#address-cells = <1>;
#size-cells = <0>;
* - there are 3 LEDs connected via MCU to PCIe
* ports. One of these ports supports mSATA.
* There is no mSATA nor PCIe function.
-@@ -208,7 +206,6 @@
+@@ -214,7 +212,6 @@
* B. Again there is no such function defined.
* For now we use LED_FUNCTION_INDICATOR
*/