Skip to content

Commit

Permalink
kernel: bump 6.1 to 6.1.45
Browse files Browse the repository at this point in the history 
Changelog: https://lore.kernel.org/stable/2023081123-ion-ferment-1ce5@gregkh/

All patches automatically rebased.

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne

Tested-by: Stefan Lippers-Hollmann <[email protected]> #x86_64 (j1900)
Signed-off-by: John Audia <[email protected]>
  • Loading branch information
@graysky2 @hauke
graysky2 authored and hauke committed Aug 12, 2023
1 parent a0a5b97 commit 093d317
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.1
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .44
LINUX_KERNEL_HASH-6.1.44 = 2e51d41fe11d082ae167cee05772bb07ca7f19448d2b46772d8ca2db7673a1a5
LINUX_VERSION-6.1 = .45
LINUX_KERNEL_HASH-6.1.45 = bd2343396e7ddad8974f3689a5a067ec931f4ade793e72b1070a85cd19f1f192
2 changes: 1 addition & 1 deletion ...x/bcm27xx/patches-6.1/950-0045-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
commit->event = kzalloc(sizeof(*commit->event),
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7765,6 +7765,19 @@ static int intel_atomic_commit(struct dr
@@ -7743,6 +7743,19 @@ static int intel_atomic_commit(struct dr
state->base.legacy_cursor_update = false;
}

Expand Down
2 changes: 1 addition & 1 deletion target/linux/bcm4908/patches-6.1/700-net-dsa-bcm_sf2-enable-GPHY-for-switch-probing.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>

--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -1512,10 +1512,14 @@ static int bcm_sf2_sw_probe(struct platf
@@ -1516,10 +1516,14 @@ static int bcm_sf2_sw_probe(struct platf
rev = reg_readl(priv, REG_PHY_REVISION);
priv->hw_params.gphy_rev = rev & PHY_REVISION_MASK;

Expand Down
2 changes: 1 addition & 1 deletion target/linux/bcm4908/patches-6.1/701-net-dsa-bcm_sf2-keep-GPHY-enabled-on-the-BCM4908.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>

--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -1526,6 +1526,12 @@ static int bcm_sf2_sw_probe(struct platf
@@ -1530,6 +1530,12 @@ static int bcm_sf2_sw_probe(struct platf
priv->hw_params.core_rev >> 8, priv->hw_params.core_rev & 0xff,
priv->irq0, priv->irq1);

Expand Down
8 changes: 4 additions & 4 deletions ...neric/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
mctz = soft_limit_tree.rb_tree_per_node[nid];
if (!mctz)
return;
@@ -3522,6 +3532,9 @@ unsigned long mem_cgroup_soft_limit_recl
@@ -3523,6 +3533,9 @@ unsigned long mem_cgroup_soft_limit_recl
struct mem_cgroup_tree_per_node *mctz;
unsigned long excess;

Expand All @@ -335,23 +335,23 @@ Signed-off-by: T.J. Mercier <[email protected]>
if (order > 0)
return 0;

@@ -5382,6 +5395,7 @@ static int mem_cgroup_css_online(struct
@@ -5383,6 +5396,7 @@ static int mem_cgroup_css_online(struct
if (unlikely(mem_cgroup_is_root(memcg)))
queue_delayed_work(system_unbound_wq, &stats_flush_dwork,
2UL*HZ);
+ lru_gen_online_memcg(memcg);
return 0;
offline_kmem:
memcg_offline_kmem(memcg);
@@ -5413,6 +5427,7 @@ static void mem_cgroup_css_offline(struc
@@ -5414,6 +5428,7 @@ static void mem_cgroup_css_offline(struc
memcg_offline_kmem(memcg);
reparent_shrinker_deferred(memcg);
wb_memcg_offline(memcg);
+ lru_gen_offline_memcg(memcg);

drain_all_stock(memcg);

@@ -5424,6 +5439,7 @@ static void mem_cgroup_css_released(stru
@@ -5425,6 +5440,7 @@ static void mem_cgroup_css_released(stru
struct mem_cgroup *memcg = mem_cgroup_from_css(css);

invalidate_reclaim_iterators(memcg);
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-6.1/901-debloat_sock_diag.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
u32));
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,
@@ -2168,9 +2182,11 @@ static void __sk_free(struct sock *sk)
@@ -2175,9 +2189,11 @@ static void __sk_free(struct sock *sk)
if (likely(sk->sk_net_refcnt))
sock_inuse_add(sock_net(sk), -1);

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-6.1/902-debloat_proc.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -4093,6 +4093,8 @@ static __net_initdata struct pernet_oper
@@ -4100,6 +4100,8 @@ static __net_initdata struct pernet_oper

static int __init proto_init(void)
{
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
# ZLIB_INFLATE; DECOMPRESS_GZIP is just a wrapper.)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -134,6 +134,16 @@ CFLAGS_kobject.o += -DDEBUG
@@ -140,6 +140,16 @@ CFLAGS_kobject.o += -DDEBUG
CFLAGS_kobject_uevent.o += -DDEBUG
endif

Expand All @@ -1119,7 +1119,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)

@@ -194,6 +204,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
@@ -200,6 +210,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/
obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/
Expand Down
18 changes: 9 additions & 9 deletions ...inux/generic/pending-6.1/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
case RTN_THROW:
case RTN_UNREACHABLE:
default:
@@ -4539,6 +4558,17 @@ static int ip6_pkt_prohibit_out(struct n
@@ -4540,6 +4559,17 @@ static int ip6_pkt_prohibit_out(struct n
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
}

Expand All @@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
/*
* Allocate a dst for local (unicast / anycast) address.
*/
@@ -5032,7 +5062,8 @@ static int rtm_to_fib6_config(struct sk_
@@ -5033,7 +5063,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 ||
Expand All @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
cfg->fc_flags |= RTF_REJECT;

if (rtm->rtm_type == RTN_LOCAL)
@@ -6286,6 +6317,8 @@ static int ip6_route_dev_notify(struct n
@@ -6287,6 +6318,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);
Expand All @@ -194,15 +194,15 @@ Signed-off-by: Jonas Gorski <[email protected]>
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
@@ -6297,6 +6330,7 @@ static int ip6_route_dev_notify(struct n
@@ -6298,6 +6331,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_policy_failed_entry->rt6i_idev);
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
#endif
}
@@ -6488,6 +6522,8 @@ static int __net_init ip6_route_net_init
@@ -6489,6 +6523,8 @@ static int __net_init ip6_route_net_init

#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.fib6_has_custom_rules = false;
Expand All @@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
sizeof(*net->ipv6.ip6_prohibit_entry),
GFP_KERNEL);
@@ -6498,11 +6534,21 @@ static int __net_init ip6_route_net_init
@@ -6499,11 +6535,21 @@ static int __net_init ip6_route_net_init
ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);

Expand All @@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
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);
@@ -6529,6 +6575,8 @@ out:
@@ -6530,6 +6576,8 @@ out:
return ret;

#ifdef CONFIG_IPV6_MULTIPLE_TABLES
Expand All @@ -243,15 +243,15 @@ Signed-off-by: Jonas Gorski <[email protected]>
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
@@ -6548,6 +6596,7 @@ static void __net_exit ip6_route_net_exi
@@ -6549,6 +6597,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_policy_failed_entry);
kfree(net->ipv6.ip6_blk_hole_entry);
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
@@ -6631,6 +6680,9 @@ void __init ip6_route_init_special_entri
@@ -6632,6 +6681,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);
Expand Down

0 comments on commit 093d317

Please sign in to comment.