Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Linux Kernel for main from 6.6.43 to 6.6.46 #2232

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/security/2024-08-16-linux.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Linux ([CVE-2024-42259](https://nvd.nist.gov/vuln/detail/CVE-2024-42259))
1 change: 1 addition & 0 deletions changelog/updates/2024-08-15-linux-6.6.46-update.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Linux ([6.6.46](https://lwn.net/Articles/985672) (includes [6.6.45](https://lwn.net/Articles/985200), [6.6.44](https://lwn.net/Articles/984450)))
Original file line number Diff line number Diff line change
@@ -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.46.xz 2662560 BLAKE2B 049e6cbd7fce4dbb58c5979cf04ba074ef65832c0cee4447075444da538f5ca39ce8ebdf50a12be9a9ff5904a198b92f0847f6ade6e3f3812894d54360aaba96 SHA512 f56fcbcab5f7554a995de56d65068f65c12d257c948949dc2a53075fd4c7de6cd2a85193ce9fc1ab52935c6020867e0a47cbeb8584d8e34c001289ebfbf75e34
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down