Skip to content

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

Merged
rlmenge merged 2 commits intomainfrom
cblmargh/kernel-upgrade-main-5.15.148.1
Jan 31, 2024
Merged

[AUTOPATCHER-kernel] Kernel upgrade to version 5.15.148.1 - branch main#7535
rlmenge merged 2 commits intomainfrom
cblmargh/kernel-upgrade-main-5.15.148.1

Conversation

@CBL-Mariner-Bot
Copy link
Copy Markdown
Collaborator

[AUTOPATCHER-kernel] Kernel upgrade to version 5.15.148.1 - branch main
Upgrade pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=493769&view=results

buddy build -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=493798&view=results

CONFIG_MMC_MTK=m
CONFIG_MMC_SDHCI_BRCMSTB=m
CONFIG_MMC_SDHCI_XENON=m
CONFIG_MMC_SDHCI_OMAP=m
Copy link
Copy Markdown
Contributor

@rlmenge rlmenge Jan 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A little more color into this. The check is failing because MMC_SDHCI_OMAP got changed.

In Mariner it was originally turned on in a huge batch here: Enable arm64 hyperv and SoCs support for CBL-Mariner (#366) · microsoft/CBL-Mariner@d42ad21 (github.com)

For this PR update,to 5.15.148.1, the config was changed to have depends on certain arches (commit)
depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST

ARCH_KEYSTONE - Kconfig
ARCH_OMAP2PLUS- Kconfig

However, we never supported these arches in 2.0 so this config should imo go away and is not worth recording

CONFIG_MMC_SDHCI_OMAP=m
CONFIG_MMC_SDHCI_AM654=m
# CONFIG_MMC_OWL is not set
CONFIG_MMC_SDHCI_EXTERNAL_DMA=y
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is selected by CONFIG_MMC_SDHCI_OMAP which is now off

CONFIG_BCM_SR_THERMAL=y
# end of Broadcom thermal drivers

# CONFIG_TI_SOC_THERMAL is not set
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implied by CONFIG_MMC_SDHCI_OMAP which is now off

Copy link
Copy Markdown
Contributor

@rlmenge rlmenge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Booted in Hyper-v VM

image

Ignoring kernel check failure

@rlmenge rlmenge merged commit 964f2fa into main Jan 31, 2024
@rlmenge rlmenge deleted the cblmargh/kernel-upgrade-main-5.15.148.1 branch January 31, 2024 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants