Skip to content

Commit

Permalink
6.2: Update bore Scheduler, update for 6.2.12
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Jung <[email protected]>
  • Loading branch information
ptr1337 committed Apr 20, 2023
1 parent f513bc7 commit 7f016bc
Show file tree
Hide file tree
Showing 19 changed files with 2,056 additions and 448 deletions.
2 changes: 1 addition & 1 deletion 6.2/0001-bbr2.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 89f3a4d45dc91c408f5c02b09982c7262b55c48d Mon Sep 17 00:00:00 2001
From 9ee19b282653761511acbde09e77416a96f55a5b Mon Sep 17 00:00:00 2001
From: Peter Jung <[email protected]>
Date: Fri, 10 Mar 2023 17:59:47 +0100
Subject: [PATCH 01/15] bbr2
Expand Down
2 changes: 1 addition & 1 deletion 6.2/0002-bfq.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0a4585a3f29f2acb9bf8e27f2fe61172243c3163 Mon Sep 17 00:00:00 2001
From 5610d33c45f6785da3a9b856d1fee11fb06c78e8 Mon Sep 17 00:00:00 2001
From: Peter Jung <[email protected]>
Date: Thu, 13 Apr 2023 18:13:28 +0200
Subject: [PATCH 02/15] bfq
Expand Down
2 changes: 1 addition & 1 deletion 6.2/0003-bitmap.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7b09e20a0ef54c18d97ddfa479d39d1daab8be85 Mon Sep 17 00:00:00 2001
From f3810e5d25c92b9a4a0da90dc5c39fe1421ee533 Mon Sep 17 00:00:00 2001
From: Peter Jung <[email protected]>
Date: Mon, 13 Feb 2023 11:26:20 +0100
Subject: [PATCH 03/15] bitmap
Expand Down
12 changes: 6 additions & 6 deletions 6.2/0004-cachy.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 538ff5a6a2aa503cf813248d2a9deb19842b2d93 Mon Sep 17 00:00:00 2001
From 955ced3981bf578dc6cc299ed5f620f68ae29c39 Mon Sep 17 00:00:00 2001
From: Peter Jung <[email protected]>
Date: Thu, 13 Apr 2023 18:13:45 +0200
Subject: [PATCH 04/15] cachy
Expand Down Expand Up @@ -124,7 +124,7 @@ index 352ff53a2306..7c210744d84c 100644
vmlinuz
voffset.h
diff --git a/Makefile b/Makefile
index 416490daa76a..e2a454ac73d2 100644
index 068374cc2601..f7890837c555 100644
--- a/Makefile
+++ b/Makefile
@@ -834,6 +834,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
Expand Down Expand Up @@ -2852,7 +2852,7 @@ index 7b0fe741a088..77ad9e033358 100644

out:
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index e046a2bff207..1ea94874b0ce 100644
index 661226e38835..735994022fe0 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -69,9 +69,13 @@
Expand Down Expand Up @@ -3082,10 +3082,10 @@ index 5b7b8d4f5297..160acbbdf111 100644
static void lru_gen_age_node(struct pglist_data *pgdat, struct scan_control *sc)
{
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 0d0cc4ef2b85..544104f9f4b3 100644
index 40fe70fc2015..3028e27897d9 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -1467,6 +1467,13 @@ static struct ctl_table ipv4_net_table[] = {
@@ -1470,6 +1470,13 @@ static struct ctl_table ipv4_net_table[] = {
.extra1 = SYSCTL_ZERO,
.extra2 = &tcp_plb_max_cong_thresh,
},
Expand Down Expand Up @@ -3161,7 +3161,7 @@ index 754e0212c951..b6d7faeb737a 100644
* drop receive data on the floor. It will get retransmitted
* and hopefully then we'll have sufficient space.
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 8320d0ecb13a..37a09cd767a1 100644
index 339a9cea9047..34bd711a1e7c 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -3274,6 +3274,8 @@ static int __net_init tcp_sk_init(struct net *net)
Expand Down
4 changes: 2 additions & 2 deletions 6.2/0005-clr.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3ecdb9dc32a4858395c48328399eee7833664748 Mon Sep 17 00:00:00 2001
From 5e20c6e278ccac0b0774a4644c2aacdd924d3584 Mon Sep 17 00:00:00 2001
From: Peter Jung <[email protected]>
Date: Fri, 10 Mar 2023 18:00:48 +0100
Subject: [PATCH 05/15] clr
Expand Down Expand Up @@ -1240,7 +1240,7 @@ index 6d2dd03dafa8..750440803883 100644
EXPORT_SYMBOL(dst_release_immediate);

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 64289bc98887..228c54bbdecc 100644
index f5114b2395ae..6a7be9d3dd10 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -840,7 +840,7 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id,
Expand Down
Loading

0 comments on commit 7f016bc

Please sign in to comment.