Skip to content

Rebase edera/mainline onto master @ 666539eecdf4 - #115

Closed
edera-rebase-app[bot] wants to merge 10000 commits into
edera/mainlinefrom
rebase/edera-mainline/20261117-7ad1695c933c-666539eecdf4
Closed

edera-rebase-app[bot] wants to merge 10000 commits into
edera/mainlinefrom
rebase/edera-mainline/20261117-7ad1695c933c-666539eecdf4

Conversation

@edera-rebase-app

Copy link
Copy Markdown

Nightly rebase of edera/mainline (7ad1695c933c) onto master (666539eecdf4), driven by Claude. Not pushed automatically because the checker found drift and a build failure and Claude's report asks for a decision. Run log.

Important

Do not use the merge button: this branch replaces edera/mainline rather than merging into it. Approve the pull request to land it; the land workflow force-pushes edera/mainline to the approved head, pinned to 7ad1695c933c, and keeps a backup.

Independent checks

Builds: failure (x86_64 vmlinux on the Edera host config and arm64 vmlinux, both with the Edera features built in; per-build results in the run).

The build failed and Claude's repair round (success) left no new branch; this is the unrepaired rebase.

Old tip 7ad1695c933c
New tip bd59e1cfc08d
Old upstream base 864c07de0c7d
New upstream base 666539eecdf4
  • New branch is based on the upstream tip.
  • Downstream series is linear.
  • Downstream commit set changed: 126 before, 126 after; 2 commit(s) lost, added, or with different +/- lines.
  • Downstream drift: the tree changed by more than the upstream delta.
Commits whose hunk context moved (own +/- lines identical)
  • ea62ac9f1b0f iommu/xen: Add Xen PV-IOMMU driver → 564fa331b3d7
  • d8221bf28f22 x86/CPU/AMD: avoid printing reset reasons on Xen domU → 644ee3e585a7
  • bd1c0dba57c3 sysctl: wire up PaX softmode setting → 9841c6cb480d
  • 849ed61740ea use maximum supported mmap rnd entropy by default → 5a5b2e82cb64
  • 5b1ff5bbc8cb 9p/xen: carry the 9P session across a restore → cfa61581f947
  • 85e1da02b838 9p/xen: end foreign access on the grant refs we granted, not the intf page's → 35903485bd72
Commits lost, added, or whose own +/- lines changed
Before After
f492e4d0cb26 9p/xen: reconnect to the backend on resume 365523c9c55c 9p/xen: reconnect to the backend on resume
3f7ca89e3d70 xen/gntdev: don't copy to user space under priv->lock (#79) 5209f7143a73 xen/gntdev: don't copy to user space under priv->lock (#79)
Drift (changed lines: upstream delta vs. actual change)
--- upstream-files
+++ actual-files
@@ -24116,8 +24116,6 @@
 +++ b/drivers/xen/gntalloc.c
 --- a/drivers/xen/gntdev-dmabuf.c
 +++ b/drivers/xen/gntdev-dmabuf.c
---- a/drivers/xen/gntdev.c
-+++ b/drivers/xen/gntdev.c
 --- a/drivers/xen/grant-dma-iommu.c
 +++ b/drivers/xen/grant-dma-iommu.c
 --- a/drivers/xen/grant-dma-ops.c
--- upstream-lines
+++ actual-lines
@@ -798099,14 +798099,6 @@
 +	gfns = kzalloc_objs(*gfns, count);
 -	refs = kcalloc(op.count, sizeof(*refs), GFP_KERNEL);
 +	refs = kzalloc_objs(*refs, op.count);
-+	mutex_unlock(&priv->lock);
--		list_del(&map->next);
-+		mutex_lock(&priv->lock);
-+		map = gntdev_find_map_index(priv, op.index >> PAGE_SHIFT,
-+					    op.count);
-+		if (map)
-+			list_del(&map->next);
--	mutex_unlock(&priv->lock);
 -	mmu = devm_kzalloc(&pdev->dev, sizeof(*mmu), GFP_KERNEL);
 +	mmu = devm_kzalloc_obj(&pdev->dev, *mmu);
 -	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
@@ -895442,6 +895434,18 @@
 +	return ret;
 +}
 +
++#ifdef CONFIG_OPENPAX_SOFTMODE
++static const struct ctl_table pax_table[] = {
++	{
++		.procname       = "softmode",
++		.data           = &pax_softmode,
++		.maxlen         = sizeof(int),
++		.mode           = 0600,
++		.proc_handler   = proc_dointvec,
++	},
++};
++#endif
++
 +static const struct ctl_table sysctl_subsys_table[] = {
 +	{
 +		.procname	= "sysctl_writes_strict",
@@ -895489,6 +895493,9 @@
 +int __init sysctl_init_bases(void)
 +{
 +	register_sysctl_init("kernel", sysctl_subsys_table);
++#ifdef CONFIG_OPENPAX_SOFTMODE
++	register_sysctl_init("kernel/pax", pax_table);
++#endif
 +
 +	return 0;
 +}
@@ -895522,6 +895529,18 @@
 -	mutex_unlock(&static_key_mutex);
 -	return ret;
 +	return -ENOSYS;
+-#ifdef CONFIG_OPENPAX_SOFTMODE
+-static const struct ctl_table pax_table[] = {
+-	{
+-		.procname       = "softmode",
+-		.data           = &pax_softmode,
+-		.maxlen         = sizeof(int),
+-		.mode           = 0600,
+-		.proc_handler   = proc_dointvec,
+-	},
+-};
+-#endif
+-
 -static const struct ctl_table sysctl_subsys_table[] = {
 -#ifdef CONFIG_SYSCTL
 -	{
@@ -895571,6 +895590,9 @@
 -int __init sysctl_init_bases(void)
 -{
 -	register_sysctl_init("kernel", sysctl_subsys_table);
+-#ifdef CONFIG_OPENPAX_SOFTMODE
+-	register_sysctl_init("kernel/pax", pax_table);
+-#endif
 -
 -	return 0;
 -}
@@ -931618,64 +931640,15 @@
 +
 +			if (req)
 +				p9_req_put(priv->client, req);
--	if (priv->rings) {
--		for (i = 0; i < XEN_9PFS_NUM_RINGS; i++) {
--			struct xen_9pfs_dataring *ring = &priv->rings[i];
-+	for (i = 0; i < XEN_9PFS_NUM_RINGS; i++) {
-+		struct xen_9pfs_dataring *ring = &priv->rings[i];
--			cancel_work_sync(&ring->work);
-+		if (!ring->intf)
-+			break;
-+		if (ring->irq >= 0) {
-+			unbind_from_irqhandler(ring->irq, ring);
-+			ring->irq = -1;
-+		}
+-		cancel_work_sync(&ring->work);
+-
 +		cancel_work_sync(&ring->work);
--			if (!ring->intf)
--				break;
--			if (ring->irq >= 0) {
--				unbind_from_irqhandler(ring->irq, ring);
--				ring->irq = -1;
--			}
--			if (ring->data.in) {
--				for (j = 0; j < (1 << ring->intf->ring_order);
--				     j++) {
--					grant_ref_t ref;
--
--					ref = ring->intf->ref[j];
--					gnttab_end_foreign_access(ref, NULL);
--					ring->intf->ref[j] = INVALID_GRANT_REF;
--				}
--				free_pages_exact(ring->data.in,
--						 1UL << (ring->intf->ring_order +
--							 XEN_PAGE_SHIFT));
--				ring->data.in = NULL;
--				ring->data.out = NULL;
--			}
--			if (ring->ref != INVALID_GRANT_REF) {
--				gnttab_end_foreign_access(ring->ref, NULL);
--				ring->ref = INVALID_GRANT_REF;
-+		if (ring->data.in) {
-+			for (j = 0; j < (1 << ring->intf->ring_order); j++) {
-+				grant_ref_t ref;
-+
-+				ref = ring->intf->ref[j];
-+				gnttab_end_foreign_access(ref, NULL);
-+				ring->intf->ref[j] = INVALID_GRANT_REF;
--			free_page((unsigned long)ring->intf);
--			ring->intf = NULL;
-+			free_pages_exact(ring->data.in,
-+					 1UL << (ring->intf->ring_order +
-+						 XEN_PAGE_SHIFT));
-+			ring->data.in = NULL;
-+			ring->data.out = NULL;
++
+-	if (priv->rings) {
+-		xen_9pfs_front_free_rings(priv);
 -		kfree(priv->rings);
-+		if (ring->ref != INVALID_GRANT_REF) {
-+			gnttab_end_foreign_access(ring->ref, NULL);
-+			ring->ref = INVALID_GRANT_REF;
-+		}
-+		free_page((unsigned long)ring->intf);
-+		ring->intf = NULL;
+-	}
++	xen_9pfs_front_free_rings(priv);
 -	priv->rings = kzalloc_objs(*priv->rings, XEN_9PFS_NUM_RINGS);
 -	if (!priv->rings) {
 -		kfree(priv);

Claude's report

Summary

I rebased edera/mainline (126 non-merge commits, old tip 7ad1695c933c) from merge base 864c07de0c7d (v7.2-rc5-26646-g864c07de0c7d) onto 666539eecdf4 (v7.2-rc5-43417-g666539eecdf4), a merge-window range of 15798 upstream commits. The result is rebase-result at bd59e1cfc08d. All 126 downstream commits were replayed in order and none were dropped. Four commits conflicted and were resolved by hand: sysctl, arch/Kconfig, 9p/xen resume, and xen/gntdev. The x86_64 and arm64 vmlinux builds both pass. I expect verify-upstream-rebase.sh to exit 1 (drift), not 0. Every drift line and every changed commit it lists comes from one of the four resolutions below; I ran it and checked this.

Needs a decision

  • UNSURE: xen/gntdev: don't copy to user space under priv->lock (#79) versus upstream 7620a997e485 xen/gntdev: fix deadlock between map ioctl and mmap (Cc: stable). Both commits fix the same lockdep/deadlock bug in gntdev_ioctl_map_grant_ref() by dropping priv->lock before copy_to_user(). They differ only on the -EFAULT path.

    • Upstream re-takes the lock, looks the map up again with gntdev_find_map_index(op.index, op.count), and unlinks and puts whatever it finds.
    • Downstream takes an extra refcount_inc(&map->users) before unlocking. On failure it unlinks the map only if that exact pointer is still on priv->maps, then drops both references. On success it drops the extra reference.

    The two readings:

    • (a) Upstream's fix supersedes the downstream commit, so the downstream commit should be dropped.
    • (b) Keep the downstream variant. It satisfies every constraint upstream's fix adds (no copy_to_user under priv->lock; re-lock before touching the list; a concurrent unmap is tolerated). It also cannot unlink a different map that reused the same index after a concurrent unmap and remap, which upstream's index lookup can.

    I committed (b). The final drivers/xen/gntdev.c is byte-identical to the file on the old downstream tip, so this commit shows as changed in the checker and upstream's three -EFAULT-path lines appear as drift. If you prefer upstream's code, drop the downstream commit. e79780b9d1b6 xen/gntdev: reset the copy batch's writeable flag does not depend on it.

  • UNSURE: x86/CPU/AMD: avoid printing reset reasons on Xen domU (old d8221bf28f22) is now probably dead code. Upstream ea51d1a4c31f x86/CPU/AMD: Don't print reset reason in VMs (Cc: stable) makes print_s5_reset_status_mmio() return early when X86_FEATURE_HYPERVISOR is set (arch/x86/kernel/cpu/amd.c:1373). The downstream check (XENPV && !xen_initial_domain(), amd.c:1377) runs after it. The downstream commit replayed cleanly and I kept it unchanged. The two readings:

    • (a) It is harmless redundancy. Keep it.
    • (b) It is now dead code, along with its #include <xen/xen.h>. Drop it in a follow-up.

    One behaviour note: upstream also suppresses the message on a Xen PV dom0 whenever dom0 sees the CPUID hypervisor bit, which I expect it normally does. The downstream patch had deliberately left dom0 printing. Nothing to do unless dom0 must keep printing the reset reason.

  • UNSURE: Upstream 228e21764b38 Drivers: hv: Run VMBus kexec cleanup from syscore shutdown changes the kexec path. The VMBus kexec teardown (vmbus_initiate_unload, SynIC cpuhp removal) now runs from hv_vmbus_syscore_shutdown whenever a kexec is in progress, regardless of hypervisor type. Before, it ran only through hv_machine_shutdown, which the downstream Xen PV dom0 nested-on-Hyper-V path never installed.

    • In the nested-on-Xen case, a kernel-initiated kexec will now unload VMBus but will not call hyperv_remove_xen_vmbus_irq().
    • A PV dom0 normally kexecs through Xen, so this path is probably unreachable. Unloading is arguably an improvement, but it is untested on the nested-on-Xen configuration.

    No code was changed. Decide whether the Xen VIRQ bridge should also be torn down there.

Conflicts resolved

  • sysctl: wire up PaX softmode setting, kernel/sysctl.c. Collided with 443bea2f71c5 sysctl: consolidate CONFIG_SYSCTL into a single block in kernel/sysctl.c (and acd19f2c56f2), which moved sysctl_subsys_table and sysctl_init_bases() into the single #ifdef CONFIG_SYSCTL block. I re-added the downstream pax_table (under CONFIG_OPENPAX_SOFTMODE) and its register_sysctl_init("kernel/pax", pax_table) at the new location. The added lines are identical to the original commit. Only the position moved, so the drift is just the moved hunk.

  • use maximum supported mmap rnd entropy by default, arch/Kconfig. Collided with 8cdae75cebe0 arch/Kconfig: fix dead conditions by removing dead options, which removed ARCH_MMAP_RND_BITS_DEFAULT / ARCH_MMAP_RND_COMPAT_BITS_DEFAULT and their default ... if ... lines. I kept upstream's removal and applied only the downstream change, default ARCH_MMAP_RND_{,COMPAT_}BITS_MIN → _MAX. No arch references the removed symbols. The commit's own +/- lines are unchanged; only the hunk context moved.

  • 9p/xen: reconnect to the backend on resume, net/9p/trans_xen.c. Collided with two upstream commits:

    • b3d07d64832c 9p/xen: Use array for data rings: rings is now an embedded rings[XEN_9PFS_NUM_RINGS] array, not a kzalloc'd pointer.
    • 7b6f2e3c29fb 9p/xen: drain response work after unbinding IRQ (Fixes, Cc: stable): cancel_work_sync() now runs after unbind_from_irqhandler().

    What I kept:

    • Upstream's array. I added the downstream fields (ring_order, rings_sem, connected) next to it.
    • In the new xen_9pfs_front_init(), the downstream ring_order/init_rwsem() setup, without the separate allocation.
    • In the downstream-introduced xen_9pfs_front_free_rings(), upstream's unbind-then-cancel ordering.
    • In xen_9pfs_front_free(), an unconditional xen_9pfs_front_free_rings() with no kfree(priv->rings).

    xen_9pfs_front_disconnect() still schedules and flushes ring work before freeing the rings, and the freeing then unbinds before cancelling, so upstream's guarantee holds on the resume path too. Later downstream commits (9p/xen: grant each ring page by its own frame, ...end foreign access on the grant refs we granted...) replayed cleanly on top. In the final free_rings I confirmed the ordering is unbind → cancel_work_sync → end grants → free.

  • 9p/xen: carry the 9P session across a restore, net/9p/trans_xen.c. Collided with two upstream commits:

    • 9b4cf60c6b73 9p/xen: validate the response size from the backend (Fixes, Cc: stable), in p9_xen_response().
    • b3d07d64832c, in the alloc/free paths, again.

    Upstream's h.size < sizeof(h) || h.size > queued check is placed before the downstream control-reply branch (ring == priv->rings && h.tag == P9_NOTAG && ctl_pending), so a control reply is also size-checked before it is used. A rejected control reply ends the work, and the control waiter falls back to its existing wait_for_completion_timeout(), so nothing hangs. ring == priv->rings still means ring 0 with the array. The alloc/free hunks were fitted to the array as in the previous commit, with INIT_LIST_HEAD(&priv->session), init_completion(&priv->ctl_done) and xen_9pfs_front_session_free() kept. The commit's own +/- lines are unchanged; only the context moved.

  • xen/gntdev: don't copy to user space under priv->lock (#79), drivers/xen/gntdev.c. Collided with 7620a997e485 xen/gntdev: fix deadlock between map ioctl and mmap. I kept the downstream variant; see the first UNSURE item above.

Dropped downstream commits

None.

Build fixes

None. The branch came back from the workflow's independent build as failed, but the failure could not be reproduced and was not caused by the branch; see Builds. The branch was left unchanged at bd59e1cfc08d.

There is one latent issue I did not change, because it already exists on the old tip 7ad1695c933c and the CI configs do not reach it. drivers/hv/vmbus_drv.c:1548 and :3069 call hyperv_remove_xen_vmbus_irq(). include/asm-generic/mshyperv.h declares hyperv_setup_xen_vmbus_irq() and its stub but not hyperv_remove_xen_vmbus_irq(). An arm64 build with CONFIG_HYPERV_VMBUS=y would therefore fail with an implicit declaration. The arm64 CI config has # CONFIG_HYPERV is not set. The fix belongs in the downstream commit that added the asm-generic declarations (drivers: hv: tear down the Xen VMBus interrupt bridge on unwind).

Upstream commits that meet the series

Fixes (Fixes:/stable/CVE) are marked [fix]. "Intact" means I read the final tree and the fix's checks and ordering are present, and the downstream code added nearby is covered by them.

net/9p, fs/9p, include/net/9p:

  • 4d183e6f1532 9p/xen: fix refcount leak in p9_xen_response() on wrong tag [fix]: intact; p9_req_put() on the wrong-tag path is present.
  • 9b4cf60c6b73 9p/xen: validate the response size from the backend [fix]: intact, and it now also guards the downstream control-reply branch (conflict above).
  • 7b6f2e3c29fb 9p/xen: drain response work after unbinding IRQ [fix]: intact in xen_9pfs_front_free_rings(), which teardown, resume-disconnect and reconnect-error all use.
  • b3d07d64832c 9p/xen: Use array for data rings: adopted. No leftover priv->rings NULL checks or kfree.
  • 241d46901226 9p: reject RERROR/RLERROR with zero errcode: intact in p9_check_errors(). The downstream control-request parser in trans_xen.c already rejects ecode == 0 and ecode > MAX_ERRNO, so the two agree.
  • 2acd800de882 9p: fix caches_show() out-of-bounds write [fix], 7fb9bd365905 9p: fix privport option setting wrong RDMA field [fix]: intact in fs/9p/v9fs.c; no overlap with the downstream shared-frontend code.
  • Non-fixes, no interaction: 9eb9b583ea35 9p: remove duplicated assignment in v9fs_fill_super(), 8bb0279930cc 9p: skip intermediate directory entry name copy in p9dirent_read(), 33625427a382 net/9p: add vsock transport, 5852cdf0006f net/9p: fix typos in comments.

drivers/xen:

  • 7620a997e485 xen/gntdev: fix deadlock between map ioctl and mmap [fix]: the deadlock fix is intact through the downstream variant (UNSURE above).
  • 2b66f2cc7532 Xen/gnttab: improve error handling in gnttab_dma_{alloc,free}_pages() [fix], 4ebb3b8d129c xen: don't allow gnttab_dma_[alloc|free]_pages() in PV guest, 704f812cdab8 xen/grant-table: annotate on-stack work in gnttab_unmap_refs_sync() [fix], 6eecb67b69af xen/grant-table: stop setting PG_private on pages for grant mapping, 0af298e62e5c treewide: refresh kmalloc_obj() conversions: all intact. The downstream gnttab_alloc_pages_node() (which gnttab_alloc_pages() now wraps) never sets PG_private, and nothing under drivers/xen, arch/x86/xen or include/xen uses PagePrivate.

Xen backends/frontends:

  • a02926f7c89b xen-blkback: Avoid UAF when reading I/O statistics [fix]: intact. rings_lock covers ring alloc, disconnect and the stats reader, and the downstream per-ring kthread/IRQ node placement works only on rings published under it.
  • bfddc420afe8 xen-netback: defer xenvif_mcast_addr_list_free() [fix]: intact. The free happens only in backend_disconnect() after synchronize_net(), and the downstream per-queue kthread/IRQ placement does not reintroduce the earlier free.
  • 0af298e62e5c (xen-blkfront.c, hv/channel.c): no interaction.

x86:

  • ea51d1a4c31f x86/CPU/AMD: Don't print reset reason in VMs [fix]: intact; makes the downstream domU check redundant (UNSURE above).
  • cf27412f19c9 x86/bugs: Mitigate TSA on AMD Zen5: no interaction with the downstream hunk.

Hyper-V:

  • 2690d4156b51 iommu/hyperv: Add para-virtualized IOMMU support for Hyper-V guest: hv_iommu_init is hooked only in hyperv_init(), not in the downstream hyperv_init_nested_on_xen() path, so the nested-on-Xen dom0 does not turn on the Hyper-V pvIOMMU.
  • 118bdac10546 Drivers: hv: Add logical device ID registry for vPCI devices: the registry is set up in hv_common_init(), which the nested-on-Xen init also calls. It does not overlap the downstream vPCI MSI routing.
  • 228e21764b38 Drivers: hv: Run VMBus kexec cleanup from syscore shutdown: see UNSURE above.
  • 56fb075b77f8 mshv: Redesign hypervisor memory deposit logic, dd57772e36f7 Drivers: hv: vmbus: Check ACPI companion before use, d0ec95a8a4e7 hv_netvsc: Advertise the SR-IOV capability for CoCo VMs: no interaction. Nothing in the series uses removed helpers.

IOMMU:

  • 1ae140d0f272 iommu: Make iommu-dma helpers private: the downstream xen-iommu.c calls no iommu-dma helpers and already includes iommu-priv.h. dma-iommu.c now includes iommu-priv.h twice (once from upstream, once from downstream iommu/dma: Don't reserve PCI windows under a paravirtual IOMMU). That is harmless because the header has an include guard, but a follow-up could drop the downstream line.
  • fdd81f15fc43 iommu/dma: Clean up redundant MSI cookie check, 1c8f6308e557 iommu/dma: Catch scatterlist length overflows, 641a9b9cc697 dma-mapping: use exact allocation for DMA pages, 95d2fec40c48 dma-mapping: rename dma_opt_mapping_size(): intact. The downstream xen_iommu_manages_iova() check in iova_reserve_iommu_regions() sits correctly.
  • 0bf031ba8c49 iommu: Add Broadcom BCM2712 IOMMU driver, 42eed9bb9ca4 iommu: apple-dart: ... (Kconfig/Makefile): context only.

mm (OpenPaX):

  • [fix]: b1ee87802111, 0193e8336802, 4c2dec1dce36, 168ed9c5d5ec, c386d799f423, 769417e410dd, 13fc99f46399, 8146c6478224, ef694e2d2101, 68cb098eadda, 7135a05838e8, aa09311c40f6.
  • Not fixes: dc0b17144d62, 14a5c975b138, 38564710f443, 6a9ef02c60bf, 72a993449cb0 (removes VM_SPECIAL), 44debd840ec9, c911e7ebebf5 (renames is_vm_hugetlb_page), 94c86564538e, 88d77002e1a1, 99fd6bf43d5d, 61e012ab9a1c, 9201d0f5b9d5, d99c4a302c5a, 7fdbc26b69c0, b7b4d8f37a4f, 4852f3421456, 6335c786299f, 9cae38dc11da, 86a779c53204, f85eb0656c40, c2d4ccfbba3f, e59c9a971a9f, fe73aa910ea5, 4b019e056f6c, 47e725702b0b, bbe5d3b3d402, 69d38c792c53.

All of these are intact in the final tree. The downstream PaX flags are a separate mm_struct field accessed with bitops and never write VMA flags directly, so the atomic-VMA-flag fixes are unaffected. The downstream MPROTECT check (map_deny_write_exec) is still called from mmap_region before the mmap hooks and from mprotect. VM_SPECIAL, is_vm_hugetlb_page and file_doesnt_need_get appear nowhere in the tree.

Other:

  • 0f4a9e682f7f xattr: always invoke cap_convert_nscap() for security.capability writes [fix]: intact. The downstream change only adds pax_getxattr.
  • init/main.c: 278b2abf660a init/bootconfig: pass init arguments in documented order [fix], 51e766bcd35e [fix], b82ed0e3a1da [fix], 958c01049e0a, aabe6e1b36ce, 677f83795fdf, 2e83e2ce34ff: intact. The downstream pax_softmode= is a plain __setup handler and is unaffected.
  • kernel/sysctl.c: 443bea2f71c5, acd19f2c56f2 (conflict above); 242bac52294e, d08ab285b096, 2bfbb09b505c: the downstream proc_dointvec on an int is still valid.
  • arch/Kconfig: 8cdae75cebe0 (conflict above); 35e340a47888 mm: userland pgtable freeing is RCU-safe now, remove leftover bits: context only.
  • Documentation/admin-guide/kernel-parameters.txt: 13 upstream commits (38828d44f31e, 799203afd298, e3e7a85730a4, f000a06da2a5, 28d5df7b7274, 084100a1b579, 10823ced2f18, 8ebd2eb87f50, 681f3b68f435, 537ec2b15fdd, 5728d3523f12, abaa0835b4f3, 264d8fd2794f) touch unrelated entries. The downstream pax_softmode= entry applied cleanly.

Builds

The workflow's first independent build of bd59e1cfc08d was reported as failed. In the repair round I found:

  • Only the x86_64 log came back (build-x86_64.log), and it passed: it ends with kernel-build: x86_64 vmlinux built.
  • No arm64 log came back at all. The workflow writes that log through tee from the first line of kernel-build.sh, so the arm64 job must have failed before the build step ran (checkout, bundle fetch, artifact download or toolchain install), not in the kernel build. The cause is in the Actions run, not on the branch.

In the repair round I rebuilt both arches from fresh object directories at bd59e1cfc08d, with no changes to the branch:

  • x86_64: pass (kernel-build.sh, Edera host config from edera-dev/linux-kernel-oci@530e23bbf906; olddefconfig only warned about five unrelated =m symbols that are invalid as modules).
  • arm64: pass (gcc aarch64-linux-gnu-, the same toolchain the workflow installs; defconfig plus downstream features; CONFIG_HYPERV is not set, see the latent issue under Build fixes).

verify-upstream-rebase.sh gives the same result as before (exit 1, with the 2 changed commits and the drift explained under Conflicts resolved). There is no new drift.

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.