Browse Source

kernel: bump 5.10 to 5.10.30

Deleted (reverse-applicable):
mvebu/patches-5.10/101-ARM-dts-turris-omnia-configure-LED-2--INTn-pin-as-interrupt-pin.patch

Automatically refreshed:
bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch
generic/backport-5.10/610-v5.13-02-netfilter-Fix-fall-through-warnings-for-Clang.patch
generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
generic/hack-5.10/204-module_strip.patch
generic/hack-5.10/902-debloat_proc.patch
generic/pending-5.10/203-kallsyms_uncompressed.patch
generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
generic/pending-5.10/920-mangle_bootargs.patch
mediatek/patches-5.10/115-dts-bpi64-add-snand-support.patch
mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
mediatek/patches-5.10/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch
ramips/patches-5.10/323-mt7621-memory-detect.patch

Signed-off-by: Rui Salvaterra <[email protected]>
Rui Salvaterra 4 years ago
parent
commit
a3d431ccf7

+ 2 - 2
include/kernel-version.mk

@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
 endif
 endif
 
 
 LINUX_VERSION-5.4 = .110
 LINUX_VERSION-5.4 = .110
-LINUX_VERSION-5.10 = .28
+LINUX_VERSION-5.10 = .30
 
 
 LINUX_KERNEL_HASH-5.4.110 = d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228
 LINUX_KERNEL_HASH-5.4.110 = d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228
-LINUX_KERNEL_HASH-5.10.28 = 4dfc3aea719556e63e90b8692e9d4b779ad1cb2a9a4823bf721e30004e7ac354
+LINUX_KERNEL_HASH-5.10.30 = d40269b5ac5c8424ec808f4484c7f80947f8f2d549b1ef1a5149aec5b6a20640
 
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

+ 2 - 2
target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch

@@ -116,7 +116,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  }
  }
 --- a/drivers/gpio/gpiolib.c
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -1897,7 +1897,8 @@ int gpiochip_add_pingroup_range(struct g
+@@ -1893,7 +1893,8 @@ int gpiochip_add_pingroup_range(struct g
  
  
  	list_add_tail(&pin_range->node, &gdev->pin_ranges);
  	list_add_tail(&pin_range->node, &gdev->pin_ranges);
  
  
@@ -126,7 +126,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  }
  }
  EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range);
  EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range);
  
  
-@@ -1954,7 +1955,7 @@ int gpiochip_add_pin_range(struct gpio_c
+@@ -1950,7 +1951,7 @@ int gpiochip_add_pin_range(struct gpio_c
  
  
  	list_add_tail(&pin_range->node, &gdev->pin_ranges);
  	list_add_tail(&pin_range->node, &gdev->pin_ranges);
  
  

+ 1 - 1
target/linux/generic/backport-5.10/610-v5.13-02-netfilter-Fix-fall-through-warnings-for-Clang.patch

@@ -24,7 +24,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  	case CT_DCCP_INVALID:
  	case CT_DCCP_INVALID:
 --- a/net/netfilter/nf_tables_api.c
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -8364,6 +8364,7 @@ static int nf_tables_check_loops(const s
+@@ -8367,6 +8367,7 @@ static int nf_tables_check_loops(const s
  							data->verdict.chain);
  							data->verdict.chain);
  				if (err < 0)
  				if (err < 0)
  					return err;
  					return err;

+ 2 - 2
target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch

@@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  	nft_trans_table_update(trans) = true;
  	nft_trans_table_update(trans) = true;
  	list_add_tail(&trans->list, &ctx->net->nft.commit_list);
  	list_add_tail(&trans->list, &ctx->net->nft.commit_list);
  	return 0;
  	return 0;
-@@ -7873,11 +7877,10 @@ static int nf_tables_commit(struct net *
+@@ -7876,11 +7880,10 @@ static int nf_tables_commit(struct net *
  		switch (trans->msg_type) {
  		switch (trans->msg_type) {
  		case NFT_MSG_NEWTABLE:
  		case NFT_MSG_NEWTABLE:
  			if (nft_trans_table_update(trans)) {
  			if (nft_trans_table_update(trans)) {
@@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  			} else {
  			} else {
  				nft_clear(net, trans->ctx.table);
  				nft_clear(net, trans->ctx.table);
  			}
  			}
-@@ -8090,11 +8093,9 @@ static int __nf_tables_abort(struct net
+@@ -8093,11 +8096,9 @@ static int __nf_tables_abort(struct net
  		switch (trans->msg_type) {
  		switch (trans->msg_type) {
  		case NFT_MSG_NEWTABLE:
  		case NFT_MSG_NEWTABLE:
  			if (nft_trans_table_update(trans)) {
  			if (nft_trans_table_update(trans)) {

+ 1 - 1
target/linux/generic/hack-5.10/204-module_strip.patch

@@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
  
 --- a/init/Kconfig
 --- a/init/Kconfig
 +++ b/init/Kconfig
 +++ b/init/Kconfig
-@@ -2338,6 +2338,13 @@ config UNUSED_KSYMS_WHITELIST
+@@ -2337,6 +2337,13 @@ config UNUSED_KSYMS_WHITELIST
  	  one per line. The path can be absolute, or relative to the kernel
  	  one per line. The path can be absolute, or relative to the kernel
  	  source tree.
  	  source tree.
  
  

+ 1 - 1
target/linux/generic/hack-5.10/902-debloat_proc.patch

@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
  
 --- a/net/core/sock.c
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -3680,6 +3680,8 @@ static __net_initdata struct pernet_oper
+@@ -3674,6 +3674,8 @@ static __net_initdata struct pernet_oper
  
  
  static int __init proto_init(void)
  static int __init proto_init(void)
  {
  {

+ 1 - 1
target/linux/generic/pending-5.10/203-kallsyms_uncompressed.patch

@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 
 --- a/init/Kconfig
 --- a/init/Kconfig
 +++ b/init/Kconfig
 +++ b/init/Kconfig
-@@ -1385,6 +1385,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+@@ -1384,6 +1384,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
  	  the unaligned access emulation.
  	  the unaligned access emulation.
  	  see arch/parisc/kernel/unaligned.c for reference
  	  see arch/parisc/kernel/unaligned.c for reference
  
  

+ 7 - 7
target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  		cfg->fc_flags |= RTF_REJECT;
  		cfg->fc_flags |= RTF_REJECT;
  
  
  	if (rtm->rtm_type == RTN_LOCAL)
  	if (rtm->rtm_type == RTN_LOCAL)
-@@ -6062,6 +6093,8 @@ static int ip6_route_dev_notify(struct n
+@@ -6064,6 +6095,8 @@ static int ip6_route_dev_notify(struct n
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
  		net->ipv6.ip6_prohibit_entry->dst.dev = dev;
  		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
  		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
  #endif
  #endif
-@@ -6073,6 +6106,7 @@ static int ip6_route_dev_notify(struct n
+@@ -6075,6 +6108,7 @@ static int ip6_route_dev_notify(struct n
  		in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
  		in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  		in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
  		in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  		in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
  		in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
  #endif
  #endif
  	}
  	}
-@@ -6264,6 +6298,8 @@ static int __net_init ip6_route_net_init
+@@ -6266,6 +6300,8 @@ static int __net_init ip6_route_net_init
  
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  	net->ipv6.fib6_has_custom_rules = false;
  	net->ipv6.fib6_has_custom_rules = false;
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
  	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
  					       sizeof(*net->ipv6.ip6_prohibit_entry),
  					       sizeof(*net->ipv6.ip6_prohibit_entry),
  					       GFP_KERNEL);
  					       GFP_KERNEL);
-@@ -6274,11 +6310,21 @@ static int __net_init ip6_route_net_init
+@@ -6276,11 +6312,21 @@ static int __net_init ip6_route_net_init
  			 ip6_template_metrics, true);
  			 ip6_template_metrics, true);
  	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
  	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
  
  
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
  	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
  	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
  	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
  			 ip6_template_metrics, true);
  			 ip6_template_metrics, true);
-@@ -6305,6 +6351,8 @@ out:
+@@ -6307,6 +6353,8 @@ out:
  	return ret;
  	return ret;
  
  
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  out_ip6_prohibit_entry:
  out_ip6_prohibit_entry:
  	kfree(net->ipv6.ip6_prohibit_entry);
  	kfree(net->ipv6.ip6_prohibit_entry);
  out_ip6_null_entry:
  out_ip6_null_entry:
-@@ -6324,6 +6372,7 @@ static void __net_exit ip6_route_net_exi
+@@ -6326,6 +6374,7 @@ static void __net_exit ip6_route_net_exi
  	kfree(net->ipv6.ip6_null_entry);
  	kfree(net->ipv6.ip6_null_entry);
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  	kfree(net->ipv6.ip6_prohibit_entry);
  	kfree(net->ipv6.ip6_prohibit_entry);
@@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	kfree(net->ipv6.ip6_blk_hole_entry);
  	kfree(net->ipv6.ip6_blk_hole_entry);
  #endif
  #endif
  	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
  	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
-@@ -6401,6 +6450,9 @@ void __init ip6_route_init_special_entri
+@@ -6403,6 +6452,9 @@ void __init ip6_route_init_special_entri
  	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
  	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
  	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
  	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
  	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
  	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);

+ 1 - 1
target/linux/generic/pending-5.10/920-mangle_bootargs.patch

@@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
 
 
 --- a/init/Kconfig
 --- a/init/Kconfig
 +++ b/init/Kconfig
 +++ b/init/Kconfig
-@@ -1791,6 +1791,15 @@ config EMBEDDED
+@@ -1790,6 +1790,15 @@ config EMBEDDED
  	  an embedded system so certain expert options are available
  	  an embedded system so certain expert options are available
  	  for configuration.
  	  for configuration.
  
  

+ 2 - 2
target/linux/mediatek/patches-5.10/115-dts-bpi64-add-snand-support.patch

@@ -1,5 +1,5 @@
---- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts	2021-03-13 13:46:37.057936814 +0200
-+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts	2021-03-13 13:49:26.957481217 +0200
+--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
++++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 @@ -114,7 +114,7 @@
 @@ -114,7 +114,7 @@
  };
  };
  
  

+ 1 - 1
target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch

@@ -253,7 +253,7 @@ Signed-off-by: chuanjia.liu <[email protected]>
  				#interrupt-cells = <1>;
  				#interrupt-cells = <1>;
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-@@ -270,18 +270,16 @@
+@@ -296,18 +296,16 @@
  	};
  	};
  };
  };
  
  

+ 1 - 1
target/linux/mediatek/patches-5.10/900-dts-mt7622-bpi-r64-aliases-for-dtoverlay.patch

@@ -1,6 +1,6 @@
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-@@ -279,14 +279,14 @@
+@@ -305,14 +305,14 @@
  &pcie1 {
  &pcie1 {
  	pinctrl-names = "default";
  	pinctrl-names = "default";
  	pinctrl-0 = <&pcie1_pins>;
  	pinctrl-0 = <&pcie1_pins>;

+ 0 - 64
target/linux/mvebu/patches-5.10/101-ARM-dts-turris-omnia-configure-LED-2--INTn-pin-as-interrupt-pin.patch

@@ -1,64 +0,0 @@
-From: "Marek Behún" <[email protected]>
-To: Gregory CLEMENT <[email protected]>
-Cc: "Marek Behún" <[email protected]>, Rui Salvaterra <[email protected]>, "Uwe Kleine-König" <[email protected]>, [email protected], Andrew Lunn <[email protected]>, [email protected]
-Subject: [PATCH mvebu-dt] ARM: dts: turris-omnia: configure LED[2]/INTn pin as interrupt pin
-Date: Sun, 21 Feb 2021 00:11:44 +0100
-Message-Id: <[email protected]>
-X-Mailer: git-send-email 2.26.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use the `marvell,reg-init` DT property to configure the LED[2]/INTn pin
-of the Marvell 88E1514 ethernet PHY on Turris Omnia into interrupt mode.
-
-Without this the pin is by default in LED[2] mode, and the Marvell PHY
-driver configures LED[2] into "On - Link, Blink - Activity" mode.
-
-This fixes the issue where the pca9538 GPIO/interrupt controller (which
-can't mask interrupts in HW) received too many interrupts and after a
-time started ignoring the interrupt with error message:
-  IRQ 71: nobody cared
-
-There is a work in progress to have the Marvell PHY driver support
-parsing PHY LED nodes from OF and registering the LEDs as Linux LED
-class devices. Once this is done the PHY driver can also automatically
-set the pin into INTn mode if it does not find LED[2] in OF.
-
-Until then, though, we fix this via `marvell,reg-init` DT property.
-
-Signed-off-by: Marek Behún <[email protected]>
-Reported-by: Rui Salvaterra <[email protected]>
-Fixes: 26ca8b52d6e1 ("ARM: dts: add support for Turris Omnia")
-Cc: Uwe Kleine-König <[email protected]>
-Cc: [email protected]
-Cc: Andrew Lunn <[email protected]>
-Cc: Gregory CLEMENT <[email protected]>
-Cc: <[email protected]>
-
----
-
-This patch fixes bug introduced with the commit that added Turris
-Omnia's DTS (26ca8b52d6e1), but will not apply cleanly because there is
-commit 8ee4a5f4f40d which changed node name and node compatible
-property and this commit did not go into stable.
-
-So either commit 8ee4a5f4f40d has also to go into stable before this, or
-this patch has to be fixed a little in order to apply to 4.14+.
-
-Please let me know how should I handle this.
-
----
- arch/arm/boot/dts/armada-385-turris-omnia.dts | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
-+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
-@@ -254,6 +254,7 @@
- 		status = "okay";
- 		compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22";
- 		reg = <1>;
-+		marvell,reg-init = <3 18 0 0x4985>;
- 
- 		/* irq is connected to &pcawan pin 7 */
- 	};

+ 1 - 1
target/linux/ramips/patches-5.10/323-mt7621-memory-detect.patch

@@ -118,7 +118,7 @@ Signed-off-by: Chuanhong Guo <[email protected]>
  
  
 --- a/arch/mips/ralink/of.c
 --- a/arch/mips/ralink/of.c
 +++ b/arch/mips/ralink/of.c
 +++ b/arch/mips/ralink/of.c
-@@ -85,6 +85,8 @@ void __init plat_mem_setup(void)
+@@ -83,6 +83,8 @@ void __init plat_mem_setup(void)
  	of_scan_flat_dt(early_init_dt_find_memory, NULL);
  	of_scan_flat_dt(early_init_dt_find_memory, NULL);
  	if (memory_dtb)
  	if (memory_dtb)
  		of_scan_flat_dt(early_init_dt_scan_memory, NULL);
  		of_scan_flat_dt(early_init_dt_scan_memory, NULL);