From 76b4c4a64d411ca6b4cff558a0af42359aae4183 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 9 Apr 2024 10:45:01 +0200 Subject: [PATCH] Revert "Merge pull request #1844 from flatcar/linux-6.6.25-flatcar-3913" This reverts commit 04282b99159af4db098f6149e9df3d2616a1b8a6, reversing changes made to c2bcd0483bb4ddf66f51ea9587685fb1667ecc4c. --- changelog/updates/2024-04-05-linux-6.6.25-update.md | 1 - ...{coreos-kernel-6.6.25.ebuild => coreos-kernel-6.6.21.ebuild} | 0 ...oreos-modules-6.6.25.ebuild => coreos-modules-6.6.21.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...oreos-sources-6.6.25.ebuild => coreos-sources-6.6.21.ebuild} | 0 5 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 changelog/updates/2024-04-05-linux-6.6.25-update.md rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-6.6.25.ebuild => coreos-kernel-6.6.21.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-6.6.25.ebuild => coreos-modules-6.6.21.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-6.6.25.ebuild => coreos-sources-6.6.21.ebuild} (100%) diff --git a/changelog/updates/2024-04-05-linux-6.6.25-update.md b/changelog/updates/2024-04-05-linux-6.6.25-update.md deleted file mode 100644 index bd645c466a..0000000000 --- a/changelog/updates/2024-04-05-linux-6.6.25-update.md +++ /dev/null @@ -1 +0,0 @@ -- Linux ([6.6.25](https://lwn.net/Articles/968470) (includes [6.6.24](https://lwn.net/Articles/968253), [6.6.23](https://lwn.net/Articles/966758), [6.6.22](https://lwn.net/Articles/965606))) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.25.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.21.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.25.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.21.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.25.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.21.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.25.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.21.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index ef2d5ed97a..c9ffb4b190 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 -DIST patch-6.6.25.xz 1612364 BLAKE2B 6222c5fabff2db4be9fedfedd52b226e08e3f9d8a1f07cafb4dd3cc6c9f1723d9b8441d603f73f801c7822c933ad8bc477862cbfc5c1c16fde2412fb1d6989c7 SHA512 ecba9c468e1199a09fb04780f94021eac92b77820cf0baf96e1b15938e0c673121cce1dfc6a11702da2a00701c1cb70aeec62682aed2412cccaf61f27f55b7c8 +DIST patch-6.6.21.xz 1336272 BLAKE2B af67c4510431195fac48a4d1507bacc3eb3fbd455d5234cb54443287545ba913839bf795193e55969c1444e0021ddc8408e2e0c67f6063aa7ea56126f2e86bb1 SHA512 e7c8e640fc519d6c92cd13985a7e37d2c8fe0277b7386a9f861c39a6f164d815133b5fb02a691d43c7b79563b09d6ea78674af0ccecfef1b418f4d03bf52a9bc diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.25.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.21.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.25.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.21.ebuild