-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1736 from flatcar/linux-6.6.21-main
Upgrade Linux Kernel for main from 6.6.17 to 6.6.21
- Loading branch information
Showing
6 changed files
with
106 additions
and
1 deletion.
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| - Linux ([6.6.21](https://lwn.net/Articles/964561) (includes [6.6.20](https://lwn.net/Articles/964307), [6.6.19](https://lwn.net/Articles/964173), [6.6.18](https://lwn.net/Articles/963357))) |
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest
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 @@ | ||
| DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 | ||
| DIST patch-6.6.17.xz 1123116 BLAKE2B 4f985a22e11257aadc0c0d78ebbc67778433ae46ebf9fe256986d252d33fb9369b0eab15926d6832cdf5f1d55fb31d8f04080b68fa082872f4faccd4b9a69270 SHA512 9dff20d8ea6e9b374ff3e43490f8171d143602b93d5ba55b8cbe3778a2474cba7ceb8f8da7c20a990bfb47095b7fa238e5b64be911cc57dc45c8c0dd34ca4055 | ||
| DIST patch-6.6.21.xz 1336272 BLAKE2B af67c4510431195fac48a4d1507bacc3eb3fbd455d5234cb54443287545ba913839bf795193e55969c1444e0021ddc8408e2e0c67f6063aa7ea56126f2e86bb1 SHA512 e7c8e640fc519d6c92cd13985a7e37d2c8fe0277b7386a9f861c39a6f164d815133b5fb02a691d43c7b79563b09d6ea78674af0ccecfef1b418f4d03bf52a9bc |
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
103 changes: 103 additions & 0 deletions
103
...kernel/coreos-sources/files/6.6/z0003-Revert-x86-boot-Remove-the-bugger-off-message.patch
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 |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| From 9f34a9ffe5b94aee93baa5762719546e0bebc28d Mon Sep 17 00:00:00 2001 | ||
| From: Kai Lueke <[email protected]> | ||
| Date: Fri, 15 Mar 2024 11:49:50 +0100 | ||
| Subject: [PATCH] Revert "x86/boot: Remove the 'bugger off' message" | ||
|
|
||
| This reverts commit 768171d7ebbce005210e1cf8456f043304805c15 because for | ||
| now this is still needed to store the dm-verity hash. | ||
| --- | ||
| arch/x86/boot/header.S | 49 ++++++++++++++++++++++++++++++++++++++++++ | ||
| arch/x86/boot/setup.ld | 7 +++--- | ||
| 2 files changed, 52 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S | ||
| index a1bbedd989e4..c7624caf6840 100644 | ||
| --- a/arch/x86/boot/header.S | ||
| +++ b/arch/x86/boot/header.S | ||
| @@ -41,15 +41,64 @@ SYSSEG = 0x1000 /* historical load address >> 4 */ | ||
|
|
||
| .code16 | ||
| .section ".bstext", "ax" | ||
| + | ||
| + .global bootsect_start | ||
| +bootsect_start: | ||
| #ifdef CONFIG_EFI_STUB | ||
| # "MZ", MS-DOS header | ||
| .word MZ_MAGIC | ||
| +#endif | ||
| + | ||
| + # Normalize the start address | ||
| + ljmp $BOOTSEG, $start2 | ||
| + | ||
| +start2: | ||
| + movw %cs, %ax | ||
| + movw %ax, %ds | ||
| + movw %ax, %es | ||
| + movw %ax, %ss | ||
| + xorw %sp, %sp | ||
| + sti | ||
| + cld | ||
| + | ||
| + movw $bugger_off_msg, %si | ||
| + | ||
| +msg_loop: | ||
| + lodsb | ||
| + andb %al, %al | ||
| + jz bs_die | ||
| + movb $0xe, %ah | ||
| + movw $7, %bx | ||
| + int $0x10 | ||
| + jmp msg_loop | ||
| + | ||
| +bs_die: | ||
| + # Allow the user to press a key, then reboot | ||
| + xorw %ax, %ax | ||
| + int $0x16 | ||
| + int $0x19 | ||
| + | ||
| + # int 0x19 should never return. In case it does anyway, | ||
| + # invoke the BIOS reset code... | ||
| + ljmp $0xf000,$0xfff0 | ||
| + | ||
| +#ifdef CONFIG_EFI_STUB | ||
| .org 0x38 | ||
| # | ||
| # Offset to the PE header. | ||
| # | ||
| .long LINUX_PE_MAGIC | ||
| .long pe_header | ||
| +#endif /* CONFIG_EFI_STUB */ | ||
| + | ||
| + .section ".bsdata", "a" | ||
| +bugger_off_msg: | ||
| + .ascii "Use a boot loader.\r\n" | ||
| + .ascii "\n" | ||
| + .ascii "Remove disk and press any key to reboot...\r\n" | ||
| + .byte 0 | ||
| + | ||
| +#ifdef CONFIG_EFI_STUB | ||
| pe_header: | ||
| .long PE_MAGIC | ||
|
|
||
| diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld | ||
| index 3a2d1360abb0..c3e354d312d0 100644 | ||
| --- a/arch/x86/boot/setup.ld | ||
| +++ b/arch/x86/boot/setup.ld | ||
| @@ -10,11 +10,10 @@ ENTRY(_start) | ||
| SECTIONS | ||
| { | ||
| . = 0; | ||
| - .bstext : { | ||
| - *(.bstext) | ||
| - . = 495; | ||
| - } =0xffffffff | ||
| + .bstext : { *(.bstext) } | ||
| + .bsdata : { *(.bsdata) } | ||
|
|
||
| + . = 495; | ||
| .header : { *(.header) } | ||
| .entrytext : { *(.entrytext) } | ||
| .inittext : { *(.inittext) } | ||
| -- | ||
| 2.44.0 | ||
|
|