kernel: bump 5.10 to 5.10.216 (coolsnowwolf#12127)

467815891a · May 4, 2024 · e5c26e9 · e5c26e9
1 parent 0f35cfb
commit e5c26e9
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 108 deletions.
diff --git a/include/kernel-5.10 b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .215
-LINUX_KERNEL_HASH-5.10.215 = 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9
+LINUX_VERSION-5.10 = .216
+LINUX_KERNEL_HASH-5.10.216 = e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151
diff --git a/...neric/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/...neric/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
@@ -1913,7 +1913,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		eth_hw_addr_inherit(slave_dev, master);
 --- a/net/ethernet/eth.c
 +++ b/net/ethernet/eth.c
-@@ -506,13 +506,14 @@ unsigned char * __weak arch_get_platform
+@@ -496,13 +496,14 @@ unsigned char * __weak arch_get_platform
 
  int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)
  {

diff --git a/target/linux/generic/backport-5.10/797-v5.17-net-usb-ax88179_178a-add-TSO-feature.patch b/target/linux/generic/backport-5.10/797-v5.17-net-usb-ax88179_178a-add-TSO-feature.patch
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
  	/* Enable checksum offload */
  	*tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP |
-@@ -1587,17 +1588,19 @@ ax88179_tx_fixup(struct usbnet *dev, str
+@@ -1582,17 +1583,19 @@ ax88179_tx_fixup(struct usbnet *dev, str
  {
  	u32 tx_hdr1, tx_hdr2;
  	int frame_size = dev->maxpacket;
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	if ((skb_header_cloned(skb) || headroom < 0) &&
  	    pskb_expand_head(skb, headroom < 0 ? 8 : 0, 0, GFP_ATOMIC)) {
  		dev_kfree_skb_any(skb);
-@@ -1608,6 +1611,8 @@ ax88179_tx_fixup(struct usbnet *dev, str
+@@ -1603,6 +1606,8 @@ ax88179_tx_fixup(struct usbnet *dev, str
  	put_unaligned_le32(tx_hdr1, ptr);
  	put_unaligned_le32(tx_hdr2, ptr + 4);
 

diff --git a/target/linux/generic/pending-5.10/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-5.10/610-netfilter_match_bypass_default_checks.patch
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		for (i = sizeof(struct ipt_entry);
  		     i < e->target_offset;
  		     i += m->u.match_size) {
-@@ -1224,12 +1261,15 @@ compat_copy_entry_to_user(struct ipt_ent
+@@ -1226,12 +1263,15 @@ compat_copy_entry_to_user(struct ipt_ent
  	compat_uint_t origsize;
  	const struct xt_entry_match *ematch;
  	int ret = 0;

diff --git a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -136,14 +136,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  /**
   * eth_type_trans - determine the packet's protocol ID.
   * @skb: received socket data
-@@ -174,6 +186,10 @@ __be16 eth_type_trans(struct sk_buff *sk
- 		} else {
- 			skb->pkt_type = PACKET_OTHERHOST;
+@@ -426,6 +438,10 @@ struct sk_buff *eth_gro_receive(struct l
+ 			NAPI_GRO_CB(p)->same_flow = 0;
+ 			continue;
  		}
 +
 +		if (eth_check_local_mask(eth->h_dest, dev->dev_addr,
 +					 dev->local_addr_mask))
 +			skb->gro_skip = 1;
  	}
 
- 	/*
+ 	type = eh->h_proto;
diff --git a/...ux/generic/pending-5.10/701-01-arm64-dts-mediatek-mt7622-add-support-for-coherent-D.patch b/...ux/generic/pending-5.10/701-01-arm64-dts-mediatek-mt7622-add-support-for-coherent-D.patch
diff --git a/...ux/generic/pending-5.10/701-04-arm64-dts-mediatek-mt7622-introduce-nodes-for-Wirele.patch b/...ux/generic/pending-5.10/701-04-arm64-dts-mediatek-mt7622-introduce-nodes-for-Wirele.patch
diff --git a/target/linux/generic/pending-5.10/920-mangle_bootargs.patch b/target/linux/generic/pending-5.10/920-mangle_bootargs.patch
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  /*
   * We need to store the untouched command line for future reference.
   * We also need to store the touched command line since the parameter
-@@ -866,6 +889,7 @@ asmlinkage __visible void __init __no_sa
+@@ -868,6 +891,7 @@ asmlinkage __visible void __init __no_sa
  	pr_notice("%s", linux_banner);
  	early_security_init();
  	setup_arch(&command_line);

diff --git a/target/linux/ipq806x/patches-5.10/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-5.10/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
@@ -189,7 +189,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  static int kernel_init(void *);
 
  extern void init_IRQ(void);
-@@ -903,6 +907,18 @@ asmlinkage __visible void __init __no_sa
+@@ -905,6 +909,18 @@ asmlinkage __visible void __init __no_sa
  	pr_notice("Kernel command line: %s\n", saved_command_line);
  	/* parameters may set static keys */
  	jump_label_init();

diff --git a/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
@@ -187,7 +187,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
  static int kernel_init(void *);
 
  extern void init_IRQ(void);
-@@ -901,6 +905,18 @@ asmlinkage __visible void __init __no_sa
+@@ -903,6 +907,18 @@ asmlinkage __visible void __init __no_sa
  	page_alloc_init();
 
  	pr_notice("Kernel command line: %s\n", saved_command_line);

diff --git a/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch
@@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  static int kernel_init(void *);
 
  extern void init_IRQ(void);
-@@ -901,6 +905,18 @@ asmlinkage __visible void __init __no_sa
+@@ -903,6 +907,18 @@ asmlinkage __visible void __init __no_sa
  	page_alloc_init();
 
  	pr_notice("Kernel command line: %s\n", saved_command_line);

diff --git a/target/linux/phytium/patches-5.10/001-add-phytium-support.patch b/target/linux/phytium/patches-5.10/001-add-phytium-support.patch
@@ -1849,15 +1849,15 @@
 +obj-$(CONFIG_PHYTIUM_IXIC)		+= irq-phytium-ixic.o
 --- a/drivers/irqchip/irq-gic-v3-its.c
 +++ b/drivers/irqchip/irq-gic-v3-its.c
-@@ -4792,6 +4792,7 @@ static void its_restore_enable(void)
+@@ -4787,6 +4787,7 @@ static void its_restore_enable(void)
  {
  	struct its_node *its;
  	int ret;
 +	int cpu;
 
  	raw_spin_lock(&its_lock);
  	list_for_each_entry(its, &its_nodes, entry) {
-@@ -4845,6 +4846,23 @@ static void its_restore_enable(void)
+@@ -4840,6 +4841,23 @@ static void its_restore_enable(void)
  		    GITS_TYPER_HCC(gic_read_typer(base + GITS_TYPER)))
  			its_cpu_init_collection(its);
  	}