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
Open
DLPX-98112 linux-kernel-generic: rebase Delphix patchset onto Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1#57lyriclake wants to merge 10000 commits into
lyriclake wants to merge 10000 commits into
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rebases the Delphix patchset onto Ubuntu tag
Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1, replacing the previous baseUbuntu-hwe-6.17-6.17.0-40.40_24.04.1. Recreates the rebase thatlinux-pkg/develop/update-package/linux-kernel-genericfailed to complete.Ubuntu-hwe-7.0-7.0.0-28.28_24.04.1(917185778ef2b3cb674c703dfd055eb0c4af67de)Ubuntu-hwe-6.17-6.17.0-40.40_24.04.1(063d17a50448cbb5ef703221a62f6af6d1fb78d1)8f4441107409— Extract PKG_ABI from mutated stringConflicting:
include/asm-generic/mshyperv.hUpstream cause:
56f727d2cc7a— UBUNTU: SAUCE: (no-up) hv: Supply vendor ID and package ABIVerdict:
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
linux-kernel-generic@e92af378a006(againstdevelop)ipu7-driversDKMS module failed to compile against the new kernel's V4L2 subdev API (drivers/media/i2c/ov02c10.c: error: implicit declaration of function 'v4l2_subdev_state_get_format'/'struct v4l2_subdev' has no member named 'entity') — a stale Ubuntu-side DKMS pin, unrelated to this patchset, that our build tooling doesn't exclude. Fix: DLPX-98296 linux-kernel-generic pre-push build fails: ipu7-drivers DKMS module missing do_ipu7=false disable flag linux-pkg#405 (DLPX-98296).ab-pre-push build #14718: IN PROGRESS
linux-kernel-generic@e92af378a006,linux-pkg@065c38acf7f7,zfs@e62b28d4bbc4(againstdevelop)do_ipu7=falsefix (PR #405) and the zfssockaddr_unsizedfix (PR #2305, needed because this hwe-7.0 kernel's headers carry the same API change as aws's) both included as extra repos; re-run recording in completed mode once finished.