Skip to content

Commit 40bc6b9

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: bump 5.18 to 5.18.15 (coolsnowwolf#9859) kernel: bump 5.15 to 5.15.58 (coolsnowwolf#9860)
2 parents cd27bed + d8e3416 commit 40bc6b9

10 files changed

+27
-27
lines changed

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .57
2-
LINUX_KERNEL_HASH-5.15.57 = 62e3095a1fc876315150c93aad1546cc198e3ba5863b3d7ff7da21fbee20f0fd
1+
LINUX_VERSION-5.15 = .58
2+
LINUX_KERNEL_HASH-5.15.58 = d75bd9579c4b318e6162e21c591878fd37efda0f79c5cdd0dc4eb9ea9dfc4fa8

‎include/kernel-5.18

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.18 = .14
2-
LINUX_KERNEL_HASH-5.18.14 = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af
1+
LINUX_VERSION-5.18 = .15
2+
LINUX_KERNEL_HASH-5.18.15 = 69804febdc388a69dfb64493b7b58d402853de3a14144ea8db7fd67c30dcbe3c

‎target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@
706706
EXPORT_SYMBOL(xfrm_parse_spi);
707707
--- a/net/ipv4/tcp_input.c
708708
+++ b/net/ipv4/tcp_input.c
709-
@@ -4133,14 +4133,16 @@ static bool tcp_parse_aligned_timestamp(
709+
@@ -4138,14 +4138,16 @@ static bool tcp_parse_aligned_timestamp(
710710
{
711711
const __be32 *ptr = (const __be32 *)(th + 1);
712712

‎target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
7171
*/
7272
--- a/include/linux/skbuff.h
7373
+++ b/include/linux/skbuff.h
74-
@@ -2771,6 +2771,10 @@ static inline int pskb_trim(struct sk_bu
74+
@@ -2816,6 +2816,10 @@ static inline int pskb_trim(struct sk_bu
7575
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
7676
}
7777

@@ -82,7 +82,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
8282
/**
8383
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
8484
* @skb: buffer to alter
85-
@@ -2921,16 +2925,6 @@ static inline struct sk_buff *dev_alloc_
85+
@@ -2966,16 +2970,6 @@ static inline struct sk_buff *dev_alloc_
8686
}
8787

8888

‎target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]>
2222
#include <linux/crc32.h>
2323
#include <linux/if_vlan.h>
2424
#include <linux/uaccess.h>
25-
@@ -6852,6 +6853,22 @@ static void rtl_tally_reset(struct r8152
25+
@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
2626
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
2727
}
2828

@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <[email protected]>
4545
static void r8152b_init(struct r8152 *tp)
4646
{
4747
u32 ocp_data;
48-
@@ -6893,6 +6910,8 @@ static void r8152b_init(struct r8152 *tp
48+
@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
4949
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
5050
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
5151
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <[email protected]>
5454
}
5555

5656
static void r8153_init(struct r8152 *tp)
57-
@@ -7033,6 +7052,8 @@ static void r8153_init(struct r8152 *tp)
57+
@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
5858
tp->coalesce = COALESCE_SLOW;
5959
break;
6060
}
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]>
6363
}
6464

6565
static void r8153b_init(struct r8152 *tp)
66-
@@ -7115,6 +7136,8 @@ static void r8153b_init(struct r8152 *tp
66+
@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
6767
rtl_tally_reset(tp);
6868

6969
tp->coalesce = 15000; /* 15 us */

‎target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
struct list_head *br_ip_list);
1313
--- a/include/linux/skbuff.h
1414
+++ b/include/linux/skbuff.h
15-
@@ -877,6 +877,10 @@ struct sk_buff {
15+
@@ -912,6 +912,10 @@ struct sk_buff {
1616
#endif
1717
__u8 slow_gro:1;
1818

@@ -111,7 +111,7 @@
111111

112112
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
113113
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
114-
@@ -5213,6 +5221,11 @@ void netdev_rx_handler_unregister(struct
114+
@@ -5214,6 +5222,11 @@ void netdev_rx_handler_unregister(struct
115115
}
116116
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
117117

@@ -123,7 +123,7 @@
123123
/*
124124
* Limit the use of PFMEMALLOC reserves to those protocols that implement
125125
* the special handling of PFMEMALLOC skbs.
126-
@@ -5261,6 +5274,10 @@ static int __netif_receive_skb_core(stru
126+
@@ -5262,6 +5275,10 @@ static int __netif_receive_skb_core(stru
127127
int ret = NET_RX_DROP;
128128
__be16 type;
129129

@@ -134,7 +134,7 @@
134134
net_timestamp_check(!netdev_tstamp_prequeue, skb);
135135

136136
trace_netif_receive_skb(skb);
137-
@@ -5298,6 +5315,15 @@ another_round:
137+
@@ -5299,6 +5316,15 @@ another_round:
138138
goto out;
139139
}
140140

‎target/linux/generic/hack-5.18/760-net-usb-r8152-add-LED-configuration-from-OF.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]>
2222
#include <linux/crc32.h>
2323
#include <linux/if_vlan.h>
2424
#include <linux/uaccess.h>
25-
@@ -6852,6 +6853,22 @@ static void rtl_tally_reset(struct r8152
25+
@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
2626
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
2727
}
2828

@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <[email protected]>
4545
static void r8152b_init(struct r8152 *tp)
4646
{
4747
u32 ocp_data;
48-
@@ -6893,6 +6910,8 @@ static void r8152b_init(struct r8152 *tp
48+
@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
4949
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
5050
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
5151
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <[email protected]>
5454
}
5555

5656
static void r8153_init(struct r8152 *tp)
57-
@@ -7033,6 +7052,8 @@ static void r8153_init(struct r8152 *tp)
57+
@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
5858
tp->coalesce = COALESCE_SLOW;
5959
break;
6060
}
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]>
6363
}
6464

6565
static void r8153b_init(struct r8152 *tp)
66-
@@ -7115,6 +7136,8 @@ static void r8153b_init(struct r8152 *tp
66+
@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
6767
rtl_tally_reset(tp);
6868

6969
tp->coalesce = 15000; /* 15 us */

‎target/linux/generic/pending-5.15/655-increase_skb_pad.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
99

1010
--- a/include/linux/skbuff.h
1111
+++ b/include/linux/skbuff.h
12-
@@ -2737,7 +2737,7 @@ static inline int pskb_network_may_pull(
12+
@@ -2782,7 +2782,7 @@ static inline int pskb_network_may_pull(
1313
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
1414
*/
1515
#ifndef NET_SKB_PAD

‎target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
2222
#endif
2323
--- a/include/linux/skbuff.h
2424
+++ b/include/linux/skbuff.h
25-
@@ -855,6 +855,7 @@ struct sk_buff {
25+
@@ -890,6 +890,7 @@ struct sk_buff {
2626
#ifdef CONFIG_IPV6_NDISC_NODETYPE
2727
__u8 ndisc_nodetype:2;
2828
#endif
@@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
3232
__u8 inner_protocol_type:1;
3333
--- a/net/core/dev.c
3434
+++ b/net/core/dev.c
35-
@@ -6061,6 +6061,9 @@ static enum gro_result dev_gro_receive(s
35+
@@ -6062,6 +6062,9 @@ static enum gro_result dev_gro_receive(s
3636
int same_flow;
3737
int grow;
3838

@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
4242
if (netif_elide_gro(skb->dev))
4343
goto normal;
4444

45-
@@ -8075,6 +8078,48 @@ static void __netdev_adjacent_dev_unlink
45+
@@ -8076,6 +8079,48 @@ static void __netdev_adjacent_dev_unlink
4646
&upper_dev->adj_list.lower);
4747
}
4848

@@ -91,23 +91,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
9191
static int __netdev_upper_dev_link(struct net_device *dev,
9292
struct net_device *upper_dev, bool master,
9393
void *upper_priv, void *upper_info,
94-
@@ -8126,6 +8171,7 @@ static int __netdev_upper_dev_link(struc
94+
@@ -8127,6 +8172,7 @@ static int __netdev_upper_dev_link(struc
9595
if (ret)
9696
return ret;
9797

9898
+ netdev_update_addr_mask(dev);
9999
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
100100
&changeupper_info.info);
101101
ret = notifier_to_errno(ret);
102-
@@ -8222,6 +8268,7 @@ static void __netdev_upper_dev_unlink(st
102+
@@ -8223,6 +8269,7 @@ static void __netdev_upper_dev_unlink(st
103103

104104
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
105105

106106
+ netdev_update_addr_mask(dev);
107107
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
108108
&changeupper_info.info);
109109

110-
@@ -9041,6 +9088,7 @@ int dev_set_mac_address(struct net_devic
110+
@@ -9042,6 +9089,7 @@ int dev_set_mac_address(struct net_devic
111111
if (err)
112112
return err;
113113
dev->addr_assign_type = NET_ADDR_SET;

‎target/linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@
782782

783783
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
784784
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
785-
@@ -2907,6 +2907,8 @@ static int stmmac_init_dma_engine(struct
785+
@@ -2898,6 +2898,8 @@ static int stmmac_init_dma_engine(struct
786786
if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
787787
atds = 1;
788788

0 commit comments

Comments
 (0)