Merge pull request #2240 from flatcar/linux-6.6.47-main

Upgrade Linux Kernel for main from 6.6.43 to 6.6.47
This commit is contained in:
Mathieu Tortuyaux 2024-08-28 16:31:07 +02:00 committed by GitHub
commit 83004c3835
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 9 additions and 7 deletions

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
- Linux ([6.6.47](https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tag/?h=v6.6.47) (includes [6.6.46](https://lwn.net/Articles/985672), [6.6.45](https://lwn.net/Articles/985200), [6.6.44](https://lwn.net/Articles/984450)))

View File

@ -1,2 +1,2 @@
DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
DIST patch-6.6.43.xz 2470884 BLAKE2B 9529efc4c575df9df7d1463894ceec4d4ccdfa5401ac7ee6109bf5a5c079206073c66ff796dfe0b7308010ed7325123b4e9528c6b8e1cb91a0b7d401b2e53a0d SHA512 693dc595034707ce6992fa0c118f9ef8ba8841f563b89d1d53480485dad1934295c62c39aac83247de91760717a3fef1bbab02c98969e7c6ef934479f7ab604b
DIST patch-6.6.47.xz 2694732 BLAKE2B 6942d4f29fe6fca3cedbc5f1887fa35b525f44099ec6ef0b4dd0e9437e12e8f1ad30dbdf0bb531c991463ba33c97ad170f2de345c76342077da0298a90617a9c SHA512 689be6284807380288c8232f1497a54b16db823393306e7ffe93a2972b9f411aa4b64a02cd0b27502c60a86b683c38143f4966676b3abc579e09815ae4ff9dcf

View File

@ -1,18 +1,18 @@
diff --git a/init/Kconfig b/init/Kconfig
index 6d35728b94b2..9ae94bf60971 100644
index e173364abd6c..cdc35682e03b 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1888,7 +1888,7 @@ config RUST
depends on !MODVERSIONS
@@ -1899,7 +1899,7 @@ config RUST
depends on !GCC_PLUGINS
depends on !RANDSTRUCT
depends on !SHADOW_CALL_STACK
- depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
+ depends on !DEBUG_INFO_BTF
help
Enables Rust support in the kernel.
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index fa307f93fa2e..f18386d4712f 100644
index da5513cfc125..f2b3aab6d4a1 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -394,15 +394,6 @@ config PAHOLE_HAS_BTF_TAG
@ -29,8 +29,8 @@ index fa307f93fa2e..f18386d4712f 100644
- using DEBUG_INFO_BTF_MODULES.
-
config DEBUG_INFO_BTF_MODULES
def_bool y
depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF
bool "Generate BTF type information for kernel modules"
default y
diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
index 728d55190d97..c293941612e7 100755
--- a/scripts/pahole-flags.sh