diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-21 19:32:22 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-21 19:32:22 +0100 |
| commit | 6d23e9cbda56f043899adba37921a1632505858e (patch) | |
| tree | 6a7ba932568eab7cc33de50a555bbc4e9bb9e083 | |
| parent | cc7b51d6210e77ce487a66268fdc4a41ed08a6fa (diff) | |
| parent | 3667ec8eb344e3f333ae27efa256060245d59356 (diff) | |
| download | kernel-6d23e9cbda56f043899adba37921a1632505858e.tar.gz kernel-6d23e9cbda56f043899adba37921a1632505858e.tar.xz kernel-6d23e9cbda56f043899adba37921a1632505858e.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc0.20221221gitb6bb9676f216.10.vanilla.1.fc38kernel-6.2.0-0.rc0.20221221gitb6bb9676f216.10.vanilla.1.fc37kernel-6.2.0-0.rc0.20221221gitb6bb9676f216.10.vanilla.1.fc36
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rw-r--r-- | Patchlist.changelog | 4 | ||||
| -rwxr-xr-x | kernel.spec | 11 | ||||
| -rw-r--r-- | patch-6.2-redhat.patch | 4 | ||||
| -rw-r--r-- | sources | 6 |
5 files changed, 15 insertions, 12 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 3b2ab7716..a68e6b9df 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 9 +RHEL_RELEASE = 10 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index 5fd79f108..eae117786 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/166d6b590caf7744adc104581493a98b129b3d31 - 166d6b590caf7744adc104581493a98b129b3d31 Revert "arm64: remove special treatment for the link order of head.o" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/bd7cb112bc916fbaa71c838de09ef8894a9f99e3 + bd7cb112bc916fbaa71c838de09ef8894a9f99e3 Revert "arm64: remove special treatment for the link order of head.o" "https://gitlab.com/cki-project/kernel-ark/-/commit"/77542637f2e84a847a7886979e0613332695c181 77542637f2e84a847a7886979e0613332695c181 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev diff --git a/kernel.spec b/kernel.spec index 058ea903c..741661f83 100755 --- a/kernel.spec +++ b/kernel.spec @@ -130,13 +130,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc0.20221220git6feb57c2fd7c.9 +%define pkgrelease 0.rc0.20221221gitb6bb9676f216.10 %define kversion 6 -%define tarfile_release 6.1-13822-g6feb57c2fd7c +%define tarfile_release 6.1-13872-gb6bb9676f216 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20221220git6feb57c2fd7c.9%{?buildid}%{?dist} +%define specrelease 0.rc0.20221221gitb6bb9676f216.10%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3191,9 +3191,12 @@ fi # # %changelog -* Tue Dec 20 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.6feb57c2fd7c.9] +* Wed Dec 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.b6bb9676f216.10] - Revert "arm64: remove special treatment for the link order of head.o" (Justin M. Forbes) +* Wed Dec 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.b6bb9676f216.9] +- Linux v6.2.0-0.rc0.b6bb9676f216 + * Tue Dec 20 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.6feb57c2fd7c.8] - Linux v6.2.0-0.rc0.6feb57c2fd7c diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index b9b2f3a01..7f813ceb0 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -151,10 +151,10 @@ index 25247f931872..f72f0ed52e78 100644 $(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index a0da424fc93a..d19e0931a5d7 100644 +index 43c7773b89ae..2c1db1cb5528 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1297,9 +1297,9 @@ config HIGHMEM +@@ -1299,9 +1299,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE @@ -1,3 +1,3 @@ -SHA512 (linux-6.1-13822-g6feb57c2fd7c.tar.xz) = 7173f641391751406101d1ba71b7a8b88b122213bf2478ead0b2bd98882cdee47ad5f7ad30d9fa0beb7578865f95b0b2284f4bec3ebb97a29f4b0163aeb1101a -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 45c26166c919bd4d37a16e64097cda7be4e8cc2d2811417f9ff34ae0e8f1ab376265fbd52d7a900f51be7a2ec778d7dd3c891b29ba771c5e70fcd5d76b59008b -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 95d22f30f2f89b3e3ccbbf392dfe24a90a7264102a8f07b2c7f80145f4b0602686b6119328d328009273054d42004c515077ccc9eb14f82ccd84a61d0451123f +SHA512 (linux-6.1-13872-gb6bb9676f216.tar.xz) = 05e1b93f988b83ebc69d1aafbc66ef21b2627f9ad95937c1a355fc6bed71ab206275ff79732ac38b4d7bdd05cf45ef3a2424864838f7362d5db7c9256a46c241 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 1c4e8ef92e503ff26385e84e990c900265261102373877f4452f9cbb575831034e5cdc884638910345680db4c3c94abc4ce314adba8d2624114565a8e109d1fe +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 57a1774e9a2eb55713d534d1f0e349db95f98693154187ce61adf6ff2bd7c896be59065e28356bf39b2e8b34e9bba5f4ef5a32aaea45095888991a0f7ad2662a |