298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-18 07:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump to 5.4.242, 6.1.26 ()

Browse Source 
Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>
This commit is contained in:
aakkll 2023-04-29 13:13:03 +08:00 committed by GitHub
parent 585c2ca50e
commit 4f7eb15359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 24 additions and 24 deletions

4
include/kernel-5.4
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .241
LINUX_KERNEL_HASH-5.4.241 = ffc0e0ad6f47f8b7b05148d815cbab27f44fa433f3a8ed0e372d4b8647bcea7c
LINUX_VERSION-5.4 = .242
LINUX_KERNEL_HASH-5.4.242 = 142f9aed1c9f2e409dd72c5c490ad824dddf31f955ed2097d5989c4b5074fc28

4
include/kernel-6.1
View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .25
LINUX_KERNEL_HASH-6.1.25 = cb72436ceb15086ae3df65e590592030692a9237a37d64105478eb5a72493091
LINUX_VERSION-6.1 = .26
LINUX_KERNEL_HASH-6.1.26 = dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110

2
target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -465,10 +465,14 @@ void scsi_attach_vpd(struct scsi_device
@@ -472,10 +472,14 @@ void scsi_attach_vpd(struct scsi_device
return;
for (i = 4; i < vpd_buf->len; i++) {

6
target/linux/generic/backport-6.1/101-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch
View File

@ -1886,7 +1886,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
result->xdp_packets += packets;
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2071,18 +2071,18 @@ static void virtnet_stats(struct net_dev
@@ -2075,18 +2075,18 @@ static void virtnet_stats(struct net_dev
struct send_queue *sq = &vi->sq[i];
do {
@ -1909,7 +1909,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tot->rx_packets += rpackets;
tot->tx_packets += tpackets;
@@ -2693,12 +2693,12 @@ static void virtnet_get_ethtool_stats(st
@@ -2697,12 +2697,12 @@ static void virtnet_get_ethtool_stats(st
stats_base = (u8 *)&rq->stats;
do {
@ -1924,7 +1924,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
idx += VIRTNET_RQ_STATS_LEN;
}
@@ -2707,12 +2707,12 @@ static void virtnet_get_ethtool_stats(st
@@ -2711,12 +2711,12 @@ static void virtnet_get_ethtool_stats(st
stats_base = (u8 *)&sq->stats;
do {

4
target/linux/generic/hack-5.4/721-phy_packets.patch
View File

@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2694,6 +2694,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2695,6 +2695,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -2825,16 +2829,6 @@ static inline struct sk_buff *dev_alloc_
@@ -2826,16 +2830,6 @@ static inline struct sk_buff *dev_alloc_
}

2
target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

@ -12,7 +12,7 @@
struct list_head *br_ip_list);
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -827,6 +827,10 @@ struct sk_buff {
@@ -828,6 +828,10 @@ struct sk_buff {
#endif
__u8 scm_io_uring:1;

2
target/linux/generic/hack-6.1/253-ksmbd-config.patch
View File

@ -10,7 +10,7 @@ Subject: [PATCH] Kconfig: add tristate for OID and ASNI string
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2007,7 +2007,7 @@ config PADATA
@@ -2003,7 +2003,7 @@ config PADATA
bool
config ASN1

4
target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch
View File

@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3021,6 +3021,10 @@ static inline int pskb_trim(struct sk_bu
@@ -3022,6 +3022,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -3170,16 +3174,6 @@ static inline struct sk_buff *dev_alloc_
@@ -3171,16 +3175,6 @@ static inline struct sk_buff *dev_alloc_
}

2
target/linux/generic/hack-6.1/902-debloat_proc.patch
View File

@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!pe)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -4179,6 +4179,8 @@ static const struct seq_operations vmall
@@ -4183,6 +4183,8 @@ static const struct seq_operations vmall
static int __init proc_vmalloc_init(void)
{

2
target/linux/generic/hack-6.1/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

@ -12,7 +12,7 @@
struct list_head *br_ip_list);
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -986,6 +986,10 @@ struct sk_buff {
@@ -987,6 +987,10 @@ struct sk_buff {
__u8 csum_not_inet:1;
__u8 scm_io_uring:1;

2
target/linux/generic/pending-5.4/655-increase_skb_pad.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2660,7 +2660,7 @@ static inline int pskb_network_may_pull(
@@ -2661,7 +2661,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

2
target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -830,6 +830,7 @@ struct sk_buff {
@@ -831,6 +831,7 @@ struct sk_buff {
#ifdef CONFIG_NET_SCHED
__u16 tc_index; /* traffic control index */
#endif

2
target/linux/generic/pending-6.1/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
View File

@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7895,7 +7895,7 @@ static void __init alloc_node_mem_map(st
@@ -7911,7 +7911,7 @@ static void __init alloc_node_mem_map(st
if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

2
target/linux/generic/pending-6.1/203-kallsyms_uncompressed.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1485,6 +1485,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
@@ -1481,6 +1481,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference

2
target/linux/generic/pending-6.1/655-increase_skb_pad.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2987,7 +2987,7 @@ static inline int pskb_network_may_pull(
@@ -2988,7 +2988,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

2
target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -963,6 +963,7 @@ struct sk_buff {
@@ -964,6 +964,7 @@ struct sk_buff {
#ifdef CONFIG_IPV6_NDISC_NODETYPE
__u8 ndisc_nodetype:2;
#endif

2
target/linux/generic/pending-6.1/920-mangle_bootargs.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1830,6 +1830,15 @@ config EMBEDDED
@@ -1826,6 +1826,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.

2
target/linux/ipq806x/patches-5.4/999-07a-qca-nss-drv-qdisc-support.patch
View File

@ -1,6 +1,6 @@
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -817,6 +817,8 @@ struct sk_buff {
@@ -818,6 +818,8 @@ struct sk_buff {
#ifdef CONFIG_NET_CLS_ACT
__u8 tc_skip_classify:1;
__u8 tc_at_ingress:1;