projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5c68c62
)
kernel: bump 5.10 to 5.10.43
author
Rui Salvaterra
<rsalvaterra@gmail.com>
Thu, 10 Jun 2021 18:51:01 +0000
(19:51 +0100)
committer
David Bauer
<mail@david-bauer.net>
Sun, 13 Jun 2021 23:36:36 +0000
(
01:36
+0200)
No deleted or manually refreshed patches.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
include/kernel-version.mk
patch
|
blob
|
history
target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch
patch
|
blob
|
history
target/linux/generic/backport-5.10/610-v5.13-02-netfilter-Fix-fall-through-warnings-for-Clang.patch
patch
|
blob
|
history
target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
patch
|
blob
|
history
target/linux/generic/hack-5.10/901-debloat_sock_diag.patch
patch
|
blob
|
history
target/linux/generic/hack-5.10/902-debloat_proc.patch
patch
|
blob
|
history
target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
patch
|
blob
|
history
target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 85178f5195275b63f612848505b7863272052de6..fb18167cfe37cdfaef758b3ac7d8081d6b0a053f 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-7,10
+7,10
@@
ifdef CONFIG_TESTING_KERNEL
endif
LINUX_VERSION-5.4 = .124
endif
LINUX_VERSION-5.4 = .124
-LINUX_VERSION-5.10 = .4
2
+LINUX_VERSION-5.10 = .4
3
LINUX_KERNEL_HASH-5.4.124 = f7f29dda2b042d7b5986d18274413131cf70e17288c05e9a683df1f46c507d82
LINUX_KERNEL_HASH-5.4.124 = f7f29dda2b042d7b5986d18274413131cf70e17288c05e9a683df1f46c507d82
-LINUX_KERNEL_HASH-5.10.4
2 = 8ba027c73bd67b8ded2649a741d2f018db630c1cbc081700d8ffd07ab0d906e5
+LINUX_KERNEL_HASH-5.10.4
3 = 83b81e433ba2f8ee143064fb163699ee857e26dd789006bc1e9edf1ccd0bd403
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git
a/target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch
b/target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch
index b42102a9661c0886ed4d48bc9b42ff997e82b765..db3427683f3f0c0ef3cb66d1bd6a4146b4b91aef 100644
(file)
--- a/
target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch
+++ b/
target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
-@@ -
698,6 +698
,13 @@ static int at803x_aneg_done(struct phy_d
+@@ -
733,6 +733
,13 @@ static int at803x_aneg_done(struct phy_d
if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
phydev_warn(phydev, "803x_aneg_done: SGMII link is not ok\n");
aneg_done = 0;
if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
phydev_warn(phydev, "803x_aneg_done: SGMII link is not ok\n");
aneg_done = 0;
diff --git
a/target/linux/generic/backport-5.10/610-v5.13-02-netfilter-Fix-fall-through-warnings-for-Clang.patch
b/target/linux/generic/backport-5.10/610-v5.13-02-netfilter-Fix-fall-through-warnings-for-Clang.patch
index 04e3945d2f1f7a2a2af5b840e72fca62c5ee1c2a..52d04b051f198d71fcf50d9b84385cdfc4903f88 100644
(file)
--- a/
target/linux/generic/backport-5.10/610-v5.13-02-netfilter-Fix-fall-through-warnings-for-Clang.patch
+++ b/
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 <pablo@netfilter.org>
case CT_DCCP_INVALID:
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
case CT_DCCP_INVALID:
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -836
7,6 +8367
,7 @@ static int nf_tables_check_loops(const s
+@@ -836
9,6 +8369
,7 @@ static int nf_tables_check_loops(const s
data->verdict.chain);
if (err < 0)
return err;
data->verdict.chain);
if (err < 0)
return err;
diff --git
a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
index eb6c31aa0ffcf19251277296a4f84e1e824f9e13..ccfdb9384de3d3c4b8b44aed4c707bb1368186e8 100644
(file)
--- a/
target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
+++ b/
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 <pablo@netfilter.org>
nft_trans_table_update(trans) = true;
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
return 0;
nft_trans_table_update(trans) = true;
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
return 0;
-@@ -787
6,11 +7880
,10 @@ static int nf_tables_commit(struct net *
+@@ -787
8,11 +7882
,10 @@ static int nf_tables_commit(struct net *
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
@@
-86,7
+86,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
} else {
nft_clear(net, trans->ctx.table);
}
} else {
nft_clear(net, trans->ctx.table);
}
-@@ -809
3,11 +8096
,9 @@ static int __nf_tables_abort(struct net
+@@ -809
5,11 +8098
,9 @@ static int __nf_tables_abort(struct net
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
diff --git
a/target/linux/generic/hack-5.10/901-debloat_sock_diag.patch
b/target/linux/generic/hack-5.10/901-debloat_sock_diag.patch
index fc2a0a48622d627ad29083b6183c0ab0cfbd36e2..88895b457220d682f0840bd850f3a1c97c5381a1 100644
(file)
--- a/
target/linux/generic/hack-5.10/901-debloat_sock_diag.patch
+++ b/
target/linux/generic/hack-5.10/901-debloat_sock_diag.patch
@@
-77,7
+77,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
{
struct dst_entry *dst = __sk_dst_get(sk);
struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
{
struct dst_entry *dst = __sk_dst_get(sk);
-@@ -18
08,9 +1822
,11 @@ static void __sk_free(struct sock *sk)
+@@ -18
16,9 +1830
,11 @@ static void __sk_free(struct sock *sk)
if (likely(sk->sk_net_refcnt))
sock_inuse_add(sock_net(sk), -1);
if (likely(sk->sk_net_refcnt))
sock_inuse_add(sock_net(sk), -1);
diff --git
a/target/linux/generic/hack-5.10/902-debloat_proc.patch
b/target/linux/generic/hack-5.10/902-debloat_proc.patch
index 31ed45b19e2f492486704ab710bb6a9cb8225a6d..6f7a1876cde305f52a3a3cf69456ba79fc007593 100644
(file)
--- a/
target/linux/generic/hack-5.10/902-debloat_proc.patch
+++ b/
target/linux/generic/hack-5.10/902-debloat_proc.patch
@@
-330,7
+330,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -36
74,6 +3674
,8 @@ static __net_initdata struct pernet_oper
+@@ -36
82,6 +3682
,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{
static int __init proto_init(void)
{
diff --git
a/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
b/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index b6f492fcb5554ef1b855cc0a2ca3a57351b36f5f..6fe3b327c50a93388e008e4a2e5743c83f9670c6 100644
(file)
--- a/
target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/
target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@
-157,7
+157,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
case RTN_THROW:
case RTN_UNREACHABLE:
default:
case RTN_THROW:
case RTN_UNREACHABLE:
default:
-@@ -441
4,6 +4433
,17 @@ static int ip6_pkt_prohibit_out(struct n
+@@ -441
8,6 +4437
,17 @@ static int ip6_pkt_prohibit_out(struct n
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
}
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
}
@@
-175,7
+175,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
/*
* Allocate a dst for local (unicast / anycast) address.
*/
/*
* Allocate a dst for local (unicast / anycast) address.
*/
-@@ -489
4,7 +4924
,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -489
8,7 +4928
,8 @@ static int rtm_to_fib6_config(struct sk_
if (rtm->rtm_type == RTN_UNREACHABLE ||
rtm->rtm_type == RTN_BLACKHOLE ||
rtm->rtm_type == RTN_PROHIBIT ||
if (rtm->rtm_type == RTN_UNREACHABLE ||
rtm->rtm_type == RTN_BLACKHOLE ||
rtm->rtm_type == RTN_PROHIBIT ||
@@
-185,7
+185,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
cfg->fc_flags |= RTF_REJECT;
if (rtm->rtm_type == RTN_LOCAL)
cfg->fc_flags |= RTF_REJECT;
if (rtm->rtm_type == RTN_LOCAL)
-@@ -606
4,6 +6095
,8 @@ static int ip6_route_dev_notify(struct n
+@@ -606
8,6 +6099
,8 @@ static int ip6_route_dev_notify(struct n
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@
-194,7
+194,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
-@@ -607
5,6 +6108
,7 @@ static int ip6_route_dev_notify(struct n
+@@ -607
9,6 +6112
,7 @@ static int ip6_route_dev_notify(struct n
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
@@
-202,7
+202,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
#endif
}
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
#endif
}
-@@ -62
66,6 +6300
,8 @@ static int __net_init ip6_route_net_init
+@@ -62
70,6 +6304
,8 @@ static int __net_init ip6_route_net_init
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.fib6_has_custom_rules = false;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.fib6_has_custom_rules = false;
@@
-211,7
+211,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
sizeof(*net->ipv6.ip6_prohibit_entry),
GFP_KERNEL);
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
sizeof(*net->ipv6.ip6_prohibit_entry),
GFP_KERNEL);
-@@ -62
76,11 +6312
,21 @@ static int __net_init ip6_route_net_init
+@@ -62
80,11 +6316
,21 @@ static int __net_init ip6_route_net_init
ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
@@
-234,7
+234,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true);
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true);
-@@ -63
07,6 +6353
,8 @@ out:
+@@ -63
11,6 +6357
,8 @@ out:
return ret;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
return ret;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@
-243,7
+243,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
-@@ -63
26,6 +6374
,7 @@ static void __net_exit ip6_route_net_exi
+@@ -63
30,6 +6378
,7 @@ static void __net_exit ip6_route_net_exi
kfree(net->ipv6.ip6_null_entry);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
kfree(net->ipv6.ip6_prohibit_entry);
kfree(net->ipv6.ip6_null_entry);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
kfree(net->ipv6.ip6_prohibit_entry);
@@
-251,7
+251,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
kfree(net->ipv6.ip6_blk_hole_entry);
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
kfree(net->ipv6.ip6_blk_hole_entry);
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
-@@ -640
3,6 +6452
,9 @@ void __init ip6_route_init_special_entri
+@@ -640
7,6 +6456
,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_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_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->rt6i_idev = in6_dev_get(init_net.loopback_dev);
diff --git
a/target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch
b/target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch
index d2c81e4d089878ad16d1944b6e67d7e0998e6c3d..404f64ab9545af98e11756f661a07251a264f9ba 100644
(file)
--- a/
target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch
+++ b/
target/linux/rockchip/patches-5.10/105-rockchip-rock-pi-4.patch
@@
-1,6
+1,6
@@
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
--- a/arch/arm64/boot/dts/rockchip/Makefile
+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -3
5,6 +35
,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pi
+@@ -3
6,6 +36
,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pi
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb