[AUTOPATCHER-kernel] Kernel upgrade to version 5.15.148.1 - branch main (#7535)

Note that arm64 had MMC_SDHCI_OMAP turned off due to a change upstream [106136f] which specified it depends on architecture which CBL-Mariner 2.0 does not support.
2024-01-31 12:03:34 -08:00 · 2024-01-31 12:03:34 -08:00 · 964f2fabfa
parent 4edde9f7da
commit 964f2fabfa
23 changed files with 62 additions and 46 deletions
--- a/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec
+++ b/SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec
@ -9,7 +9,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for Azure
 Name:           kernel-azure-signed-%{buildarch}
-Version:        5.15.147.1
+Version:        5.15.148.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld

 %changelog
+* Tue Jan 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.148.1-1
+- Auto-upgrade to 5.15.148.1
+
 * Thu Jan 25 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.147.1-1
 - Auto-upgrade to 5.15.147.1

--- a/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec
+++ b/SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec
@ -4,7 +4,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for HCI
 Name:           kernel-hci-signed-%{buildarch}
-Version:        5.15.147.1
+Version:        5.15.148.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld

 %changelog
+* Tue Jan 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.148.1-1
+- Auto-upgrade to 5.15.148.1
+
 * Thu Jan 25 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.147.1-1
 - Auto-upgrade to 5.15.147.1

--- a/SPECS-SIGNED/kernel-signed/kernel-signed.spec
+++ b/SPECS-SIGNED/kernel-signed/kernel-signed.spec
@ -9,7 +9,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for %{buildarch} systems
 Name:           kernel-signed-%{buildarch}
-Version:        5.15.147.1
+Version:        5.15.148.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld

 %changelog
+* Tue Jan 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.148.1-1
+- Auto-upgrade to 5.15.148.1
+
 * Thu Jan 25 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.147.1-1
 - Auto-upgrade to 5.15.147.1

--- a/SPECS/hyperv-daemons/hyperv-daemons.signatures.json
+++ b/SPECS/hyperv-daemons/hyperv-daemons.signatures.json
@ -7,6 +7,6 @@
    "hypervkvpd.service": "c1bb207cf9f388f8f3cf5b649abbf8cfe4c4fcf74538612946e68f350d1f265f",
    "hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
    "hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
-    "kernel-5.15.147.1.tar.gz": "392f1b100578906728f5d7d012f084151696b4346511d34815c908c2a576f6ff"
+    "kernel-5.15.148.1.tar.gz": "e77c297fe3e3f0d9fd403c52f1e959389fa33e6642be9ddd12d4ea7f8927e5d6"
  }
 }
--- a/SPECS/hyperv-daemons/hyperv-daemons.spec
+++ b/SPECS/hyperv-daemons/hyperv-daemons.spec
@ -8,7 +8,7 @@
 %global udev_prefix 70
 Summary:        Hyper-V daemons suite
 Name:           hyperv-daemons
-Version:        5.15.147.1
+Version:        5.15.148.1
 Release:        1%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
@ -219,6 +219,9 @@ fi
 %{_sbindir}/lsvmbus

 %changelog
+* Tue Jan 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.148.1-1
+- Auto-upgrade to 5.15.148.1
+
 * Thu Jan 25 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.147.1-1
 - Auto-upgrade to 5.15.147.1

--- a/SPECS/kernel-azure/config
+++ b/SPECS/kernel-azure/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.147.1 Kernel Configuration
+# Linux/x86_64 5.15.148.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
--- a/SPECS/kernel-azure/config_aarch64
+++ b/SPECS/kernel-azure/config_aarch64
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.147.1 Kernel Configuration
+# Linux/arm64 5.15.148.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
@ -5128,8 +5128,6 @@ CONFIG_AMLOGIC_THERMAL=y
 CONFIG_BCM_SR_THERMAL=y
 # end of Broadcom thermal drivers

-# CONFIG_TI_SOC_THERMAL is not set
-
 #
 # NVIDIA Tegra thermal drivers
 #
@ -7392,10 +7390,8 @@ CONFIG_MMC_BCM2835=m
 CONFIG_MMC_MTK=m
 CONFIG_MMC_SDHCI_BRCMSTB=m
 CONFIG_MMC_SDHCI_XENON=m
-CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MMC_SDHCI_AM654=m
 # CONFIG_MMC_OWL is not set
-CONFIG_MMC_SDHCI_EXTERNAL_DMA=y
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set

--- a/SPECS/kernel-azure/kernel-azure.signatures.json
+++ b/SPECS/kernel-azure/kernel-azure.signatures.json
@ -1,9 +1,9 @@
 {
  "Signatures": {
    "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
-    "config": "4279a17b855381fd6c2a7e690487176732eea6256326b436f896ae17845a8307",
-    "config_aarch64": "9cb18eb8cc68d373c0fbff994b1d687ecbbc2502b5a14df02625087f7cd5b1c8",
+    "config": "f018f5a46e75d71fea20d42831f306159b1a3b4297a32c697398ebe915ba6055",
+    "config_aarch64": "c68fbd5b74a295a1fe2d4e27418129b6e7b276bd00fb92f9defc1174f18604a2",
    "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
-    "kernel-5.15.147.1.tar.gz": "392f1b100578906728f5d7d012f084151696b4346511d34815c908c2a576f6ff"
+    "kernel-5.15.148.1.tar.gz": "e77c297fe3e3f0d9fd403c52f1e959389fa33e6642be9ddd12d4ea7f8927e5d6"
  }
 }
--- a/SPECS/kernel-azure/kernel-azure.spec
+++ b/SPECS/kernel-azure/kernel-azure.spec
@ -27,7 +27,7 @@

 Summary:        Linux Kernel
 Name:           kernel-azure
-Version:        5.15.147.1
+Version:        5.15.148.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@ -420,6 +420,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %{_sysconfdir}/bash_completion.d/bpftool

 %changelog
+* Tue Jan 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.148.1-1
+- Auto-upgrade to 5.15.148.1
+
 * Thu Jan 25 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.147.1-1
 - Auto-upgrade to 5.15.147.1

--- a/SPECS/kernel-hci/config
+++ b/SPECS/kernel-hci/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.147.1 Kernel Configuration
+# Linux/x86_64 5.15.148.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
--- a/SPECS/kernel-hci/kernel-hci.signatures.json
+++ b/SPECS/kernel-hci/kernel-hci.signatures.json
@ -1,7 +1,7 @@
 {
  "Signatures": {
    "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
-    "config": "ef737939dc38eed54be8e8a13921a483cfdcfea189e381a536288759ce3b94e6",
-    "kernel-5.15.147.1.tar.gz": "392f1b100578906728f5d7d012f084151696b4346511d34815c908c2a576f6ff"
+    "config": "bf4cb3afab12b14653e3fff9901ac4b3925b356fc588ee4e10336d3c58cc0d90",
+    "kernel-5.15.148.1.tar.gz": "e77c297fe3e3f0d9fd403c52f1e959389fa33e6642be9ddd12d4ea7f8927e5d6"
  }
 }
--- a/SPECS/kernel-hci/kernel-hci.spec
+++ b/SPECS/kernel-hci/kernel-hci.spec
@ -17,7 +17,7 @@
 %define config_source %{SOURCE1}
 Summary:        Linux Kernel for HCI
 Name:           kernel-hci
-Version:        5.15.147.1
+Version:        5.15.148.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@ -551,6 +551,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %{_sysconfdir}/bash_completion.d/bpftool

 %changelog
+* Tue Jan 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.148.1-1
+- Auto-upgrade to 5.15.148.1
+
 * Thu Jan 25 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.147.1-1
 - Auto-upgrade to 5.15.147.1

--- a/SPECS/kernel-headers/kernel-headers.signatures.json
+++ b/SPECS/kernel-headers/kernel-headers.signatures.json
@ -1,5 +1,5 @@
 {
  "Signatures": {
-    "kernel-5.15.147.1.tar.gz": "392f1b100578906728f5d7d012f084151696b4346511d34815c908c2a576f6ff"
+    "kernel-5.15.148.1.tar.gz": "e77c297fe3e3f0d9fd403c52f1e959389fa33e6642be9ddd12d4ea7f8927e5d6"
  }
 }
--- a/SPECS/kernel-headers/kernel-headers.spec
+++ b/SPECS/kernel-headers/kernel-headers.spec
@ -11,7 +11,7 @@

 Summary:        Linux API header files
 Name:           kernel-headers
-Version:        5.15.147.1
+Version:        5.15.148.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@ -73,6 +73,9 @@ done
 %endif

 %changelog
+* Tue Jan 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.148.1-1
+- Auto-upgrade to 5.15.148.1
+
 * Thu Jan 25 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.147.1-1
 - Auto-upgrade to 5.15.147.1

--- a/SPECS/kernel/config
+++ b/SPECS/kernel/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.147.1 Kernel Configuration
+# Linux/x86_64 5.15.148.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
--- a/SPECS/kernel/config_aarch64
+++ b/SPECS/kernel/config_aarch64
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.147.1 Kernel Configuration
+# Linux/arm64 5.15.148.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
@ -5134,8 +5134,6 @@ CONFIG_AMLOGIC_THERMAL=y
 CONFIG_BCM_SR_THERMAL=y
 # end of Broadcom thermal drivers

-# CONFIG_TI_SOC_THERMAL is not set
-
 #
 # NVIDIA Tegra thermal drivers
 #
@ -7399,10 +7397,8 @@ CONFIG_MMC_BCM2835=m
 CONFIG_MMC_MTK=m
 CONFIG_MMC_SDHCI_BRCMSTB=m
 CONFIG_MMC_SDHCI_XENON=m
-CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MMC_SDHCI_AM654=m
 # CONFIG_MMC_OWL is not set
-CONFIG_MMC_SDHCI_EXTERNAL_DMA=y
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set

--- a/SPECS/kernel/kernel.signatures.json
+++ b/SPECS/kernel/kernel.signatures.json
@ -1,9 +1,9 @@
 {
  "Signatures": {
    "cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
-    "config": "c4aafe043f325248aaad5f2eef5c6b3f2bbe55b86382a51a1249d56a72207265",
-    "config_aarch64": "e18b97cf02f8ddbaea3ac8472819855d2b47bcfd303f46f72b85faddf685fc62",
+    "config": "280ab4bb65434dfe985c8e3d485b3112da6084529384173b19685e4f8c916da5",
+    "config_aarch64": "3546a62db64a7a0a0114c5f71511ce0d434eed967296907549ceb99fa94e5258",
    "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
-    "kernel-5.15.147.1.tar.gz": "392f1b100578906728f5d7d012f084151696b4346511d34815c908c2a576f6ff"
+    "kernel-5.15.148.1.tar.gz": "e77c297fe3e3f0d9fd403c52f1e959389fa33e6642be9ddd12d4ea7f8927e5d6"
  }
 }
--- a/SPECS/kernel/kernel.spec
+++ b/SPECS/kernel/kernel.spec
@ -27,7 +27,7 @@

 Summary:        Linux Kernel
 Name:           kernel
-Version:        5.15.147.1
+Version:        5.15.148.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@ -426,6 +426,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %{_sysconfdir}/bash_completion.d/bpftool

 %changelog
+* Tue Jan 30 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.148.1-1
+- Auto-upgrade to 5.15.148.1
+
 * Thu Jan 25 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.147.1-1
 - Auto-upgrade to 5.15.147.1

--- a/cgmanifest.json
+++ b/cgmanifest.json
@ -6540,8 +6540,8 @@
        "type": "other",
        "other": {
          "name": "hyperv-daemons",
-          "version": "5.15.147.1",
-          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.147.1.tar.gz"
+          "version": "5.15.148.1",
+          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.148.1.tar.gz"
        }
      }
    },
@ -8121,8 +8121,8 @@
        "type": "other",
        "other": {
          "name": "kernel",
-          "version": "5.15.147.1",
-          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.147.1.tar.gz"
+          "version": "5.15.148.1",
+          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.148.1.tar.gz"
        }
      }
    },
@ -8131,8 +8131,8 @@
        "type": "other",
        "other": {
          "name": "kernel-azure",
-          "version": "5.15.147.1",
-          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.147.1.tar.gz"
+          "version": "5.15.148.1",
+          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.148.1.tar.gz"
        }
      }
    },
@ -8141,8 +8141,8 @@
        "type": "other",
        "other": {
          "name": "kernel-hci",
-          "version": "5.15.147.1",
-          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.147.1.tar.gz"
+          "version": "5.15.148.1",
+          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.148.1.tar.gz"
        }
      }
    },
@ -8151,8 +8151,8 @@
        "type": "other",
        "other": {
          "name": "kernel-headers",
-          "version": "5.15.147.1",
-          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.147.1.tar.gz"
+          "version": "5.15.148.1",
+          "downloadUrl": "https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner-2/5.15.148.1.tar.gz"
        }
      }
    },
--- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@ -1,5 +1,5 @@
 filesystem-1.1-20.cm2.aarch64.rpm
-kernel-headers-5.15.147.1-1.cm2.noarch.rpm
+kernel-headers-5.15.148.1-1.cm2.noarch.rpm
 glibc-2.35-6.cm2.aarch64.rpm
 glibc-devel-2.35-6.cm2.aarch64.rpm
 glibc-i18n-2.35-6.cm2.aarch64.rpm
--- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@ -1,5 +1,5 @@
 filesystem-1.1-20.cm2.x86_64.rpm
-kernel-headers-5.15.147.1-1.cm2.noarch.rpm
+kernel-headers-5.15.148.1-1.cm2.noarch.rpm
 glibc-2.35-6.cm2.x86_64.rpm
 glibc-devel-2.35-6.cm2.x86_64.rpm
 glibc-i18n-2.35-6.cm2.x86_64.rpm
--- a/toolkit/resources/manifests/package/toolchain_aarch64.txt
+++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@ -136,7 +136,7 @@ intltool-0.51.0-7.cm2.noarch.rpm
 itstool-2.0.6-4.cm2.noarch.rpm
 kbd-2.2.0-1.cm2.aarch64.rpm
 kbd-debuginfo-2.2.0-1.cm2.aarch64.rpm
-kernel-headers-5.15.147.1-1.cm2.noarch.rpm
+kernel-headers-5.15.148.1-1.cm2.noarch.rpm
 kmod-29-2.cm2.aarch64.rpm
 kmod-debuginfo-29-2.cm2.aarch64.rpm
 kmod-devel-29-2.cm2.aarch64.rpm
--- a/toolkit/resources/manifests/package/toolchain_x86_64.txt
+++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@ -141,8 +141,8 @@ intltool-0.51.0-7.cm2.noarch.rpm
 itstool-2.0.6-4.cm2.noarch.rpm
 kbd-2.2.0-1.cm2.x86_64.rpm
 kbd-debuginfo-2.2.0-1.cm2.x86_64.rpm
-kernel-cross-headers-5.15.147.1-1.cm2.noarch.rpm
-kernel-headers-5.15.147.1-1.cm2.noarch.rpm
+kernel-cross-headers-5.15.148.1-1.cm2.noarch.rpm
+kernel-headers-5.15.148.1-1.cm2.noarch.rpm
 kmod-29-2.cm2.x86_64.rpm
 kmod-debuginfo-29-2.cm2.x86_64.rpm
 kmod-devel-29-2.cm2.x86_64.rpm