Skip to content

DLPX-98112 linux-kernel-generic: rebase Delphix patchset onto Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1 - #57

Open
lyriclake wants to merge 10000 commits into
developfrom
projects/kernel-merge-generic-7.0-7.0.0-28.28_24.04.1
Open

DLPX-98112 linux-kernel-generic: rebase Delphix patchset onto Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1#57
lyriclake wants to merge 10000 commits into
developfrom
projects/kernel-merge-generic-7.0-7.0.0-28.28_24.04.1

Conversation

@lyriclake

@lyriclake lyriclake commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

Rebases the Delphix patchset onto Ubuntu tag Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1, replacing the previous base
Ubuntu-hwe-6.17-6.17.0-40.40_24.04.1. Recreates the rebase that linux-pkg/develop/update-package/linux-kernel-generic failed to complete.

Field Value
Upstream tag Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1 (917185778ef2b3cb674c703dfd055eb0c4af67de)
Previous base Ubuntu-hwe-6.17-6.17.0-40.40_24.04.1 (063d17a50448cbb5ef703221a62f6af6d1fb78d1)
Patchset 9 patches (0 dropped of 9)
Conflicts resolved 1
Jira DLPX-98112

Note: GitHub will show "This branch has conflicts that must be resolved" and
a diff against the whole Ubuntu bump. Both are expected: this branch does not
descend from develop — the kernel forks are rebased onto each new
Ubuntu tag with git cherry-pick, not merged. Review the patchset commits, not
the aggregate diff. Landing is a force-push, not a GitHub merge.

8f4441107409 — Extract PKG_ABI from mutated string

Conflicting: include/asm-generic/mshyperv.h
Upstream cause: 56f727d2cc7aUBUNTU: SAUCE: (no-up) hv: Supply vendor ID and package ABI
Verdict: RE_APPLY — Ubuntu SAUCE relocated the #ifndef PKG_ABI block from before hv_do_rep_hypercall() to after it while re-applying the SAUCE stack onto the 7.0 mainline; content unchanged. New upstream still defines PKG_ABI as a bare unquoted integer, so the Delphix ABI-string mutation handling is still needed. Ported the same string-mutation logic to the relocated position verbatim.

Testing Done

ab-pre-push build #14705: FAILURE

ab-pre-push build #14718: IN PROGRESS

Loading
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.