Skip to content

Commit 7660f97

Browse files
misaka36misaka36
authored
kernel: bump to 5.4.227, 5.10.159, 5.15.83 (#10619)
* kernel: bump 5.15 to 5.15.83 Signed-off-by: Linhui Liu <[email protected]> * kernel: bump 5.10 to 5.10.159 Signed-off-by: Linhui Liu <[email protected]> * kernel: bump 5.4 to 5.4.227 Signed-off-by: Linhui Liu <[email protected]> Signed-off-by: Linhui Liu <[email protected]>
1 parent afb7eaa commit 7660f97

File tree

33 files changed

+57
-117
lines changed

33 files changed

+57
-117
lines changed

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .158
2-
LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
1+
LINUX_VERSION-5.10 = .159
2+
LINUX_KERNEL_HASH-5.10.159 = 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .82
2-
LINUX_KERNEL_HASH-5.15.82 = fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65
1+
LINUX_VERSION-5.15 = .83
2+
LINUX_KERNEL_HASH-5.15.83 = 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .226
2-
LINUX_KERNEL_HASH-5.4.226 = 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44
1+
LINUX_VERSION-5.4 = .227
2+
LINUX_KERNEL_HASH-5.4.227 = 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593

‎include/kernel-6.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.1 =
1+
LINUX_VERSION-6.1 =
22
LINUX_KERNEL_HASH-6.1 = 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb

‎target/linux/bcm27xx/patches-5.15/950-0132-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
1919

2020
--- a/drivers/media/common/videobuf2/videobuf2-core.c
2121
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
22-
@@ -2144,12 +2144,12 @@ static int __find_plane_by_offset(struct
22+
@@ -2195,12 +2195,12 @@ static int __find_plane_by_offset(struct
2323
return -EINVAL;
2424
}
2525

@@ -35,7 +35,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
3535
struct dma_buf *dbuf;
3636

3737
if (q->memory != VB2_MEMORY_MMAP) {
38-
@@ -2201,6 +2201,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
38+
@@ -2252,6 +2252,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
3939
return -EINVAL;
4040
}
4141

‎target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
3333
#define USB_VENDOR_ID_BELKIN 0x050d
3434
#define USB_DEVICE_ID_FLIP_KVM 0x3201
3535

36-
@@ -1310,6 +1313,9 @@
36+
@@ -1313,6 +1316,9 @@
3737
#define USB_VENDOR_ID_XAT 0x2505
3838
#define USB_DEVICE_ID_XAT_CSR 0x0220
3939

@@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
5353
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
5454
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
5555
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
56-
@@ -195,6 +196,7 @@ static const struct hid_device_id hid_qu
56+
@@ -198,6 +199,7 @@ static const struct hid_device_id hid_qu
5757
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
5858
{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
5959
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },

‎target/linux/bcm27xx/patches-5.15/950-0238-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
2626
/* Device and char device-related information */
2727
static DEFINE_IDA(gpio_ida);
2828
static dev_t gpio_devt;
29-
@@ -2361,8 +2363,8 @@ int gpiod_direction_output(struct gpio_d
29+
@@ -2392,8 +2394,8 @@ int gpiod_direction_output(struct gpio_d
3030
value = !!value;
3131

3232
/* GPIOs used for enabled IRQs shall not be set as output */
@@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <[email protected]>
3737
gpiod_err(desc,
3838
"%s: tried to set a GPIO tied to an IRQ as output\n",
3939
__func__);
40-
@@ -3180,8 +3182,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
40+
@@ -3211,8 +3213,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
4141
}
4242

4343
/* To be valid for IRQ the line needs to be input or open drain */

‎target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <[email protected]>
2525

2626
--- a/MAINTAINERS
2727
+++ b/MAINTAINERS
28-
@@ -17526,6 +17526,14 @@ T: git git://linuxtv.org/media_tree.git
28+
@@ -17521,6 +17521,14 @@ T: git git://linuxtv.org/media_tree.git
2929
F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
3030
F: drivers/media/i2c/imx412.c
3131

‎target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Signed-off-by: David Plowman <[email protected]>
132132
+...
133133
--- a/MAINTAINERS
134134
+++ b/MAINTAINERS
135-
@@ -17540,6 +17540,7 @@ M: Raspberry Pi Kernel Maintenance <kern
135+
@@ -17535,6 +17535,7 @@ M: Raspberry Pi Kernel Maintenance <kern
136136
L: [email protected]
137137
S: Maintained
138138
T: git git://linuxtv.org/media_tree.git

‎target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <[email protected]>
132132
+...
133133
--- a/MAINTAINERS
134134
+++ b/MAINTAINERS
135-
@@ -17544,6 +17544,14 @@ F: Documentation/devicetree/bindings/med
135+
@@ -17539,6 +17539,14 @@ F: Documentation/devicetree/bindings/med
136136
F: Documentation/devicetree/bindings/media/i2c/imx477.yaml
137137
F: drivers/media/i2c/imx477.c
138138

‎target/linux/bcm27xx/patches-5.15/950-0835-clk-Add-clk_drop_range.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
3737
rate = clk_get_rate(clk);
3838
--- a/include/linux/clk.h
3939
+++ b/include/linux/clk.h
40-
@@ -987,6 +987,17 @@ static inline void clk_bulk_disable_unpr
40+
@@ -1096,6 +1096,17 @@ static inline void clk_bulk_disable_unpr
4141
}
4242

4343
/**

‎target/linux/bcm27xx/patches-5.15/950-0845-clk-Fix-clk_get_parent-documentation.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
5555
KUNIT_CASE(clk_test_orphan_transparent_multiple_parent_mux_set_parent_set_range_modified),
5656
--- a/include/linux/clk.h
5757
+++ b/include/linux/clk.h
58-
@@ -744,8 +744,9 @@ int clk_set_parent(struct clk *clk, stru
58+
@@ -829,8 +829,9 @@ int clk_set_parent(struct clk *clk, stru
5959
* clk_get_parent - get the parent clock source for this clock
6060
* @clk: clock source
6161
*

‎target/linux/bcm27xx/patches-5.15/950-0865-clk-Add-clk_get_rate_range.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
5555
*
5656
--- a/include/linux/clk.h
5757
+++ b/include/linux/clk.h
58-
@@ -714,6 +714,17 @@ bool clk_has_parent(struct clk *clk, str
58+
@@ -799,6 +799,17 @@ bool clk_has_parent(struct clk *clk, str
5959
int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max);
6060

6161
/**
@@ -73,7 +73,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
7373
* clk_set_min_rate - set a minimum clock rate for a clock source
7474
* @clk: clock source
7575
* @rate: desired minimum clock rate in Hz, inclusive
76-
@@ -909,6 +920,16 @@ static inline int clk_set_rate_range(str
76+
@@ -1018,6 +1029,16 @@ static inline int clk_set_rate_range(str
7777
return 0;
7878
}
7979

@@ -90,7 +90,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
9090
static inline int clk_set_min_rate(struct clk *clk, unsigned long rate)
9191
{
9292
return 0;
93-
@@ -999,6 +1020,44 @@ static inline int clk_drop_range(struct
93+
@@ -1108,6 +1129,44 @@ static inline int clk_drop_range(struct
9494
}
9595

9696
/**

‎target/linux/bcm4908/patches-5.4/070-v5.10-0001-net-dsa-b53-Use-dev_-err-info-instead-of-pr_.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <[email protected]>
2626
#include <linux/delay.h>
2727
#include <linux/export.h>
2828
#include <linux/gpio.h>
29-
@@ -2475,8 +2473,9 @@ int b53_switch_detect(struct b53_device
29+
@@ -2476,8 +2474,9 @@ int b53_switch_detect(struct b53_device
3030
dev->chip_id = id32;
3131
break;
3232
default:
@@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <[email protected]>
3838
return -ENODEV;
3939
}
4040
}
41-
@@ -2506,7 +2505,8 @@ int b53_switch_register(struct b53_devic
41+
@@ -2507,7 +2506,8 @@ int b53_switch_register(struct b53_devic
4242
if (ret)
4343
return ret;
4444

‎target/linux/bcm4908/patches-5.4/071-v5.12-0001-net-dsa-bcm_sf2-support-BCM4908-s-integrated-switch.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
2323

2424
--- a/drivers/net/dsa/b53/b53_common.c
2525
+++ b/drivers/net/dsa/b53/b53_common.c
26-
@@ -2271,6 +2271,22 @@ static const struct b53_chip_data b53_sw
26+
@@ -2272,6 +2272,22 @@ static const struct b53_chip_data b53_sw
2727
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
2828
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
2929
},

‎target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <[email protected]>
222222
mdio = of_find_node_by_phandle(*ph);
223223
--- a/drivers/net/ethernet/aeroflex/greth.c
224224
+++ b/drivers/net/ethernet/aeroflex/greth.c
225-
@@ -1449,10 +1449,10 @@ static int greth_of_probe(struct platfor
225+
@@ -1450,10 +1450,10 @@ static int greth_of_probe(struct platfor
226226
break;
227227
}
228228
if (i == 6) {

‎target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ Signed-off-by: David S. Miller <[email protected]>
8282
memmove(skb->data - ETH_HLEN,
8383
--- a/net/dsa/tag_ksz.c
8484
+++ b/net/dsa/tag_ksz.c
85-
@@ -24,7 +24,7 @@ static struct sk_buff *ksz_common_rcv(st
86-
87-
pskb_trim_rcsum(skb, skb->len - len);
85+
@@ -25,7 +25,7 @@ static struct sk_buff *ksz_common_rcv(st
86+
if (pskb_trim_rcsum(skb, skb->len - len))
87+
return NULL;
8888

8989
- skb->offload_fwd_mark = true;
9090
+ dsa_default_offload_fwd_mark(skb);

‎target/linux/generic/backport-5.15/020-v6.1-04-mm-multigenerational-lru-groundwork.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
9292
}
9393
--- a/include/linux/cgroup.h
9494
+++ b/include/linux/cgroup.h
95-
@@ -432,6 +432,18 @@ static inline void cgroup_put(struct cgr
95+
@@ -433,6 +433,18 @@ static inline void cgroup_put(struct cgr
9696
css_put(&cgrp->self);
9797
}
9898

@@ -111,15 +111,15 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
111111
/**
112112
* task_css_set_check - obtain a task's css_set with extra access conditions
113113
* @task: the task to obtain css_set for
114-
@@ -446,7 +458,6 @@ static inline void cgroup_put(struct cgr
114+
@@ -447,7 +459,6 @@ static inline void cgroup_put(struct cgr
115115
* as locks used during the cgroup_subsys::attach() methods.
116116
*/
117117
#ifdef CONFIG_PROVE_RCU
118118
-extern struct mutex cgroup_mutex;
119119
extern spinlock_t css_set_lock;
120120
#define task_css_set_check(task, __c) \
121121
rcu_dereference_check((task)->cgroups, \
122-
@@ -707,6 +718,8 @@ struct cgroup;
122+
@@ -708,6 +719,8 @@ struct cgroup;
123123
static inline u64 cgroup_id(const struct cgroup *cgrp) { return 1; }
124124
static inline void css_get(struct cgroup_subsys_state *css) {}
125125
static inline void css_put(struct cgroup_subsys_state *css) {}
@@ -593,7 +593,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
593593
VM_BUG_ON_PAGE(tail > 2 && page_tail->mapping != TAIL_MAPPING,
594594
--- a/mm/memcontrol.c
595595
+++ b/mm/memcontrol.c
596-
@@ -5226,6 +5226,7 @@ static struct mem_cgroup *mem_cgroup_all
596+
@@ -5237,6 +5237,7 @@ static struct mem_cgroup *mem_cgroup_all
597597
memcg->deferred_split_queue.split_queue_len = 0;
598598
#endif
599599
idr_replace(&mem_cgroup_idr, memcg, memcg->id.id);

‎target/linux/generic/backport-5.15/020-v6.1-05-mm-multigenerational-lru-mm_struct-list.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -339,15 +339,15 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
339339
/* will mmdrop() in finish_task_switch(). */
340340
--- a/mm/memcontrol.c
341341
+++ b/mm/memcontrol.c
342-
@@ -5163,6 +5163,7 @@ static void __mem_cgroup_free(struct mem
342+
@@ -5174,6 +5174,7 @@ static void __mem_cgroup_free(struct mem
343343

344344
static void mem_cgroup_free(struct mem_cgroup *memcg)
345345
{
346346
+ lru_gen_free_memcg(memcg);
347347
memcg_wb_domain_exit(memcg);
348348
__mem_cgroup_free(memcg);
349349
}
350-
@@ -6195,6 +6196,29 @@ static void mem_cgroup_move_task(void)
350+
@@ -6206,6 +6207,29 @@ static void mem_cgroup_move_task(void)
351351
}
352352
#endif
353353

@@ -377,7 +377,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
377377
static int seq_puts_memcg_tunable(struct seq_file *m, unsigned long value)
378378
{
379379
if (value == PAGE_COUNTER_MAX)
380-
@@ -6538,6 +6562,7 @@ struct cgroup_subsys memory_cgrp_subsys
380+
@@ -6549,6 +6573,7 @@ struct cgroup_subsys memory_cgrp_subsys
381381
.css_reset = mem_cgroup_css_reset,
382382
.css_rstat_flush = mem_cgroup_css_rstat_flush,
383383
.can_attach = mem_cgroup_can_attach,

‎target/linux/generic/backport-5.15/821-v5.16-Bluetooth-btusb-Support-public-address-configuration.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Marcel Holtmann <[email protected]>
1717

1818
--- a/drivers/bluetooth/btusb.c
1919
+++ b/drivers/bluetooth/btusb.c
20-
@@ -2263,6 +2263,23 @@ struct btmtk_section_map {
20+
@@ -2268,6 +2268,23 @@ struct btmtk_section_map {
2121
};
2222
} __packed;
2323

@@ -41,7 +41,7 @@ Signed-off-by: Marcel Holtmann <[email protected]>
4141
static void btusb_mtk_wmt_recv(struct urb *urb)
4242
{
4343
struct hci_dev *hdev = urb->context;
44-
@@ -3914,6 +3931,7 @@ static int btusb_probe(struct usb_interf
44+
@@ -3919,6 +3936,7 @@ static int btusb_probe(struct usb_interf
4545
hdev->shutdown = btusb_mtk_shutdown;
4646
hdev->manufacturer = 70;
4747
hdev->cmd_timeout = btusb_mtk_cmd_timeout;

‎target/linux/generic/backport-5.15/822-v5.17-Bluetooth-btusb-Fix-application-of-sizeof-to-pointer.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Marcel Holtmann <[email protected]>
1818

1919
--- a/drivers/bluetooth/btusb.c
2020
+++ b/drivers/bluetooth/btusb.c
21-
@@ -2268,7 +2268,7 @@ static int btusb_set_bdaddr_mtk(struct h
21+
@@ -2273,7 +2273,7 @@ static int btusb_set_bdaddr_mtk(struct h
2222
struct sk_buff *skb;
2323
long ret;
2424

‎target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <[email protected]>
222222
mdio = of_find_node_by_phandle(*ph);
223223
--- a/drivers/net/ethernet/aeroflex/greth.c
224224
+++ b/drivers/net/ethernet/aeroflex/greth.c
225-
@@ -1451,10 +1451,10 @@ static int greth_of_probe(struct platfor
225+
@@ -1452,10 +1452,10 @@ static int greth_of_probe(struct platfor
226226
break;
227227
}
228228
if (i == 6) {

‎target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ Signed-off-by: Zhi Chen <[email protected]>
274274
int nf_ct_expect_register_notifier(struct net *net,
275275
--- a/net/netfilter/nf_conntrack_netlink.c
276276
+++ b/net/netfilter/nf_conntrack_netlink.c
277-
@@ -701,12 +701,19 @@ static size_t ctnetlink_nlmsg_size(const
277+
@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const
278278
}
279279

280280
static int
@@ -294,7 +294,7 @@ Signed-off-by: Zhi Chen <[email protected]>
294294
struct nf_conn *ct = item->ct;
295295
struct sk_buff *skb;
296296
unsigned int type;
297-
@@ -3756,9 +3763,15 @@ static int ctnetlink_stat_exp_cpu(struct
297+
@@ -3757,9 +3764,15 @@ static int ctnetlink_stat_exp_cpu(struct
298298
}
299299

300300
#ifdef CONFIG_NF_CONNTRACK_EVENTS

‎target/linux/generic/hack-5.15/952-add-net-conntrack-events-support-multiple-registrant.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ Signed-off-by: Zhi Chen <[email protected]>
286286
void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state)
287287
--- a/net/netfilter/nf_conntrack_netlink.c
288288
+++ b/net/netfilter/nf_conntrack_netlink.c
289-
@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const
289+
@@ -711,12 +711,19 @@ static size_t ctnetlink_nlmsg_size(const
290290
}
291291

292292
static int
@@ -306,7 +306,7 @@ Signed-off-by: Zhi Chen <[email protected]>
306306
struct nf_conn *ct = item->ct;
307307
struct sk_buff *skb;
308308
unsigned int type;
309-
@@ -3765,11 +3772,17 @@ static int ctnetlink_stat_exp_cpu(struct
309+
@@ -3766,11 +3773,17 @@ static int ctnetlink_stat_exp_cpu(struct
310310
}
311311

312312
#ifdef CONFIG_NF_CONNTRACK_EVENTS
@@ -324,7 +324,7 @@ Signed-off-by: Zhi Chen <[email protected]>
324324

325325
static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
326326
[IPCTNL_MSG_CT_NEW] = {
327-
@@ -3868,8 +3881,12 @@ static int __net_init ctnetlink_net_init
327+
@@ -3869,8 +3882,12 @@ static int __net_init ctnetlink_net_init
328328
static void ctnetlink_net_pre_exit(struct net *net)
329329
{
330330
#ifdef CONFIG_NF_CONNTRACK_EVENTS

‎target/linux/generic/pending-5.10/870-ca8210-Fix-crash-by-zero-initializing-data.patch

-30
This file was deleted.

‎target/linux/generic/pending-5.15/870-ca8210-Fix-crash-by-zero-initializing-data.patch

-30
This file was deleted.

0 commit comments

Comments
 (0)