forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.63 Removed upstreamed: generic/backport-6.1/815-v6.6-2-leds-turris-omnia-Drop-unnecessary-mutex-locking.patch generic/backport-6.1/815-v6.7-1-leds-turris-omnia-Do-not-use-SMBUS-calls.patch ixp4xx/patches-6.1/0007-watchdog-ixp4xx-Make-sure-restart-always-works.patch Manually rebased: bcm27xx/patches-6.1/950-0606-hwrng-bcm2835-sleep-more-intelligently.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.63&id=7d0e60e4ff840e97fb18afb2a7344442c10a6fdf 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.63&id=63cdeb20ee3bfef820b045b8d3b8395f9f815a74 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.63&id=8803da01fe1b4ca3d37745283f7e73c6c2558c0c Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <[email protected]>
- Loading branch information
Showing
15 changed files
with
41 additions
and
329 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.1 = .62 | ||
LINUX_KERNEL_HASH-6.1.62 = b9fd616facd6becfceef88b9be718d0f16625cab3fe81d11384802a7091e85ec | ||
LINUX_VERSION-6.1 = .63 | ||
LINUX_KERNEL_HASH-6.1.63 = c29d043b01dd4fcc61a24fd027c5c7912b15b1f10d8e3c83a0cb935885f0758d |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,10 +50,10 @@ Signed-off-by: Phil Elwell <[email protected]> | |
+ while (!num_words) { | ||
+ if (!wait || !retries) | ||
return 0; | ||
- hwrng_msleep(rng, 1000); | ||
- hwrng_yield(rng); | ||
+ retries--; | ||
+ usleep_range((u32)RNG_US_PER_WORD, | ||
+ (u32)RNG_US_PER_WORD * RNG_FIFO_WORDS); | ||
+ (u32)RNG_US_PER_WORD * RNG_FIFO_WORDS); | ||
+ num_words = rng_readl(priv, RNG_STATUS) >> 24; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -61,7 +61,7 @@ Signed-off-by: Rafał Miłecki <[email protected]> | |
#include <linux/clockchips.h> | ||
#include <linux/clocksource.h> | ||
#include <linux/clocksource_ids.h> | ||
@@ -1028,6 +1029,16 @@ static void __init arch_timer_of_configu | ||
@@ -1029,6 +1030,16 @@ static void __init arch_timer_of_configu | ||
if (of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) | ||
arch_timer_rate = rate; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Lee Jones <[email protected]> | |
|
||
--- a/drivers/leds/leds-turris-omnia.c | ||
+++ b/drivers/leds/leds-turris-omnia.c | ||
@@ -166,7 +166,7 @@ static ssize_t brightness_show(struct de | ||
@@ -194,7 +194,7 @@ static ssize_t brightness_show(struct de | ||
if (ret < 0) | ||
return ret; | ||
|
||
|
64 changes: 0 additions & 64 deletions
64
...ux/generic/backport-6.1/815-v6.6-2-leds-turris-omnia-Drop-unnecessary-mutex-locking.patch
This file was deleted.
Oops, something went wrong.
145 changes: 0 additions & 145 deletions
145
target/linux/generic/backport-6.1/815-v6.7-1-leds-turris-omnia-Do-not-use-SMBUS-calls.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#include <linux/mutex.h> | ||
#include <linux/err.h> | ||
#include <linux/property.h> | ||
@@ -3511,3 +3512,5 @@ static int __init regmap_initcall(void) | ||
@@ -3513,3 +3514,5 @@ static int __init regmap_initcall(void) | ||
return 0; | ||
} | ||
postcore_initcall(regmap_initcall); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
+MODULE_LICENSE("GPL"); | ||
--- a/kernel/sched/core.c | ||
+++ b/kernel/sched/core.c | ||
@@ -4363,6 +4363,7 @@ int wake_up_state(struct task_struct *p, | ||
@@ -4367,6 +4367,7 @@ int wake_up_state(struct task_struct *p, | ||
{ | ||
return try_to_wake_up(p, state, 0); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/netfilter/nf_tables_api.c | ||
+++ b/net/netfilter/nf_tables_api.c | ||
@@ -7882,7 +7882,7 @@ static int nft_register_flowtable_net_ho | ||
@@ -7878,7 +7878,7 @@ static int nft_register_flowtable_net_ho | ||
err = flowtable->data.type->setup(&flowtable->data, | ||
hook->ops.dev, | ||
FLOW_BLOCK_BIND); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -136,7 +136,7 @@ Signed-off-by: Maxime Chevallier <[email protected]> | |
#include <net/dst.h> | ||
#include <net/sock.h> | ||
#include <net/checksum.h> | ||
@@ -4515,6 +4519,9 @@ static const u8 skb_ext_type_len[] = { | ||
@@ -4516,6 +4520,9 @@ static const u8 skb_ext_type_len[] = { | ||
#if IS_ENABLED(CONFIG_MCTP_FLOWS) | ||
[SKB_EXT_MCTP] = SKB_EXT_CHUNKSIZEOF(struct mctp_flow), | ||
#endif | ||
|
@@ -146,7 +146,7 @@ Signed-off-by: Maxime Chevallier <[email protected]> | |
}; | ||
|
||
static __always_inline unsigned int skb_ext_total_length(void) | ||
@@ -4535,6 +4542,9 @@ static __always_inline unsigned int skb_ | ||
@@ -4536,6 +4543,9 @@ static __always_inline unsigned int skb_ | ||
#if IS_ENABLED(CONFIG_MCTP_FLOWS) | ||
skb_ext_type_len[SKB_EXT_MCTP] + | ||
#endif | ||
|
79 changes: 0 additions & 79 deletions
79
target/linux/ixp4xx/patches-6.1/0007-watchdog-ixp4xx-Make-sure-restart-always-works.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.