Skip to content

[CIQ 6.12] v6.12.17 with normal rebase #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 0 commits into from
Apr 4, 2025

Conversation

PlaidCat
Copy link
Collaborator

@PlaidCat PlaidCat commented Apr 3, 2025

Same content from this experiment with merges instead of rebase's.
This will be the proposed process of updating that will in the future me mostly automated with manual intervention as things break or need confirmations.

This is the theory

git fetch --all
git checkout ciq-6.12.y
git branch ciq-$(git describe --tags --abbrev=0 | awk -F '-' '{print $2}')
<creates new branch for ciq-6.12.16 for example>
git checkout -b {USER}_rebase_ciq-6.12.y
git rebase {v6.12.y | stable_6.12.y}
<address rebase failures as they arise (automation will kick out a ticket for an engineer to go address)
../kernel-src-tree-tools/lt_rebase.sh
git add .
git commit -m "[CIQ] Config updates for $(git describe --tags --abbrev=0 | awk -F '-' '{print $2}')"
(if there are deltas here engineers will have to evaluate these changes are fine)
git push origin {USER_rebase_ciq-6.12.y}

<PR REVIEW PROCESS>
<Approved>

git checkout ciq-6.12.y
git rebase {USER}_rebase_ciq-6.12.y}
<validate that the remote HEAD SHA is identical to the local HEAD SHA>
git tag ciq_kernel-$(git describe --tags --abbrev=0 | sed 's/^.//g')-1
git push --force origin {USER}_rebase_ciq-6.12.y}

Last Commit is the changes CIQ has made otherwise everything else merged:
9117443

[CIQ] v6.12.17 config updates
All configs dropped the follwoing since its dependent on ARCH_MVEBU
which is not configured on so there is no reason to ask.
 # CONFIG_CZNIC_PLATFORMS is not set
See upstream commit: https://github.com/ctrliq/kernel-src-tree/commit/dd0f05b98925111f4530d7dab774398cdb32e9e3

x86_64 configs also dropped a previously defined y config
 -CONFIG_IMX_SCMI_MISC_DRV=y
 This comes from firmware: imx: IMX_SCMI_MISC_DRV should depend on ARCH_MXC
See Upstream Commit: https://github.com/ctrliq/kernel-src-tree/commit/be6686b823b30a69b1f71bde228ce042c78a1941
Whats a little confusing is that the fedora kernel-ark says that this is
marked as a `y`
$ cat redhat/configs/rhel/generic/CONFIG_IMX_SCMI_MISC_DRV
CONFIG_IMX_SCMI_MISC_DRV=y

[kernel-ark]$ ls redhat/configs/kernel-6.13.8-x86_64*
redhat/configs/kernel-6.13.8-x86_64-automotive.config
redhat/configs/kernel-6.13.8-x86_64.config
redhat/configs/kernel-6.13.8-x86_64-rt.config
redhat/configs/kernel-6.13.8-x86_64-automotive-debug.config
redhat/configs/kernel-6.13.8-x86_64-debug.config
redhat/configs/kernel-6.13.8-x86_64-rt-debug.config

[kernel-ark]$ grep CONFIG_IMX_SCMI_MISC_DRV redhat/configs/kernel-6.13.8-x86_64*
[kernel-ark]$

Do to this we're leaving this as the default Kconfig of off for x86_64

Build

Will be done by PR Builders

Testing

No Testing for this PR, we're still in development and this merge had no conflicts from the last PR we merged.

Copy link
Collaborator

@bmastbergen bmastbergen left a comment

Choose a reason for hiding this comment

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

🥌

@PlaidCat PlaidCat changed the title {jmaple} rebase with uppdate [CIQ 6.12] v6.12.17 with normal rebase Apr 4, 2025
@PlaidCat PlaidCat merged commit 1eec75c into ciq-6.12.y Apr 4, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants