All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
-LINUX_VERSION-5.10 = .178
-LINUX_KERNEL_HASH-5.10.178 = 1acfade3715e560f00fb30615d5471e24b3940b549381558787aee9734e7a8af
+LINUX_VERSION-5.10 = .179
+LINUX_KERNEL_HASH-5.10.179 = 1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
-@@ -830,6 +830,13 @@ static int at803x_aneg_done(struct phy_d
+@@ -959,6 +959,13 @@ static int at803x_aneg_done(struct phy_d
if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
phydev_warn(phydev, "803x_aneg_done: SGMII link is not ok\n");
aneg_done = 0;
--- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig
-@@ -32,6 +32,7 @@ config BCMA_HOST_PCI
+@@ -36,6 +36,7 @@ config BCMA_HOST_PCI
config BCMA_HOST_SOC
bool "Support for BCMA in a SoC"
depends on HAS_IOMEM
the memory. This only works with the Broadcom SoCs from the
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
-@@ -136,6 +136,7 @@ config SSB_SFLASH
+@@ -141,6 +141,7 @@ config SSB_SFLASH
config SSB_EMBEDDED
bool
depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
-@@ -165,7 +165,7 @@ static int bcma_sprom_valid(struct bcma_
+@@ -170,7 +170,7 @@ static int bcma_sprom_valid(struct bcma_
return err;
revision = sprom[words - 1] & SSB_SPROM_REVISION_REV;
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
#include <linux/netfilter/nf_conntrack_common.h>
#endif
-@@ -786,7 +787,8 @@ struct sk_buff {
+@@ -787,7 +788,8 @@ struct sk_buff {
fclone:2,
peeked:1,
head_frag:1,
#ifdef CONFIG_SKB_EXTENSIONS
__u8 active_extensions;
#endif
-@@ -3029,9 +3031,15 @@ static inline void skb_frag_ref(struct s
+@@ -3030,9 +3032,15 @@ static inline void skb_frag_ref(struct s
*
* Releases a reference on the paged fragment @frag.
*/
}
/**
-@@ -3043,7 +3051,7 @@ static inline void __skb_frag_unref(skb_
+@@ -3044,7 +3052,7 @@ static inline void __skb_frag_unref(skb_
*/
static inline void skb_frag_unref(struct sk_buff *skb, int f)
{
}
/**
-@@ -4642,5 +4650,12 @@ static inline u64 skb_get_kcov_handle(st
+@@ -4643,5 +4651,12 @@ static inline u64 skb_get_kcov_handle(st
#endif
}
#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/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2727,6 +2727,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2728,6 +2728,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
-@@ -2858,16 +2862,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2859,16 +2863,6 @@ static inline struct sk_buff *dev_alloc_
}
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2693,7 +2693,7 @@ static inline int pskb_network_may_pull(
+@@ -2694,7 +2694,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
-@@ -863,6 +863,7 @@ struct sk_buff {
+@@ -864,6 +864,7 @@ struct sk_buff {
__u8 decrypted:1;
#endif
__u8 scm_io_uring:1;