DLPX-98112 linux-kernel-aws: rebase Delphix patchset onto Ubuntu-aws-7.0-7.0.0-1009.9_24.04.1 - #72
Open
lyriclake wants to merge 10000 commits into
Open
DLPX-98112 linux-kernel-aws: rebase Delphix patchset onto Ubuntu-aws-7.0-7.0.0-1009.9_24.04.1#72lyriclake 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-aws-7.0-7.0.0-1009.9_24.04.1, replacing the previous baseUbuntu-aws-6.17-6.17.0-1019.19_24.04.1. Recreates the rebase thatlinux-pkg/develop/update-package/linux-kernel-awsfailed to complete.Ubuntu-aws-7.0-7.0.0-1009.9_24.04.1(7fe9a458efaf211b5902f7f8e71d678a554334a6)Ubuntu-aws-6.17-6.17.0-1019.19_24.04.1(6685d2a5d2a9b95b7ad26f4886a592f6f204da31)7104c91814c2— 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— Same resolution asgeneric(8f4441107409); see PR delphix/linux-kernel-generic#57. 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; conflict shape and diff were byte-identical to the generic fork's.Testing Done
ab-pre-push build #14707: FAILURE
linux-kernel-aws@69ffacf47d20(againstdevelop)zfsfailed to compile against the new kernel (module/os/linux/zfs/sock.c:39:42: error: passing argument 2 of 'sock->ops->connect' from incompatible pointer type— expectedstruct sockaddr_unsized *, kernel API change from Linux 6.19 backported into this Ubuntu tag). Fix: https://github.com/delphix/zfs/pull/2305 (DLPX-98297).ab-pre-push build #14717: IN PROGRESS
linux-kernel-aws@69ffacf47d20,zfs@e62b28d4bbc4(againstdevelop)sockaddr_unsizedfix (PR #2305) included as an extra repo; re-run recording in completed mode once finished.