Skip to content

Rebase edera/mainline onto master @ 864c07de0c7d - #48

Merged
kaniini merged 0 commit into
edera/mainlinefrom
rebase/edera-mainline/20261023-4e04beff425b-864c07de0c7d
Oct 23, 2026
Merged

kaniini merged 0 commit into
edera/mainlinefrom
rebase/edera-mainline/20261023-4e04beff425b-864c07de0c7d

Conversation

@edera-rebase-app

Copy link
Copy Markdown

Nightly rebase of edera/mainline (4e04beff425b) onto master (864c07de0c7d), driven by Claude. Not pushed automatically because the checker found drift. 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 4e04beff425b, and keeps a backup.

Independent checks

Builds: success (x86_64 and arm64 vmlinux with the Edera features built in; per-build results in the run).

Old tip 4e04beff425b
New tip a90d5dbfe2a0
Old upstream base c03c1a14507d
New upstream base 864c07de0c7d
  • New branch is based on the upstream tip.
  • Downstream series is linear.
  • All 91 downstream commits replayed; 3 changed only in hunk context (listed below).
  • Downstream drift: the tree changed by more than the upstream delta.
Commits whose hunk context moved (own +/- lines identical)
  • 4dea901e50b7 xen-blkfront: place per-ring buffers on per-hctx nodes → fac17c0e0963
  • ef5473f15598 xattr: add support for retrieving PaX flags stored in xattrs → 1ac3aee2c11f
  • e29043736bdb arm64: determine stack entropy based on mmap entropy → a908fcd81726
Drift (changed lines: upstream delta vs. actual change)
--- upstream-lines
+++ actual-lines
@@ -144844,13 +144844,25 @@
 +	 * Interrupt teardown must be done ahead of freeing queue-related
 +	 * data, otherwise the interrupt handler can race with the cleanup.
 +	 */
-+	if (rinfo->irq)
++	if (rinfo->irq) {
++		/*
++		 * free_irq() warns if affinity_hint is still set.  Drop the
++		 * hint installed at setup time before tearing the IRQ down.
++		 */
++		irq_update_affinity_hint(rinfo->irq, NULL);
 +		unbind_from_irqhandler(rinfo->irq, rinfo);
++	}
 +	rinfo->evtchn = rinfo->irq = 0;
 +
 -
--	if (rinfo->irq)
+-	if (rinfo->irq) {
+-		/*
+-		 * free_irq() warns if affinity_hint is still set.  Drop the
+-		 * hint installed at setup time before tearing the IRQ down.
+-		 */
+-		irq_update_affinity_hint(rinfo->irq, NULL);
 -		unbind_from_irqhandler(rinfo->irq, rinfo);
+-	}
 -	rinfo->evtchn = rinfo->irq = 0;
 -	if (info->rq && info->gd) {
 -		blk_mq_stop_hw_queues(info->rq);

Claude's report

Claude left no report (rebase step: success).

Waiting for the x86_64 build to finish.

@kaniini
kaniini merged commit a90d5db into edera/mainline Oct 23, 2026
@kaniini
kaniini deleted the rebase/edera-mainline/20261023-4e04beff425b-864c07de0c7d branch October 23, 2026 16:50
kaniini added a commit that referenced this pull request Oct 23, 2026
GitHub starts no workflow for a review of a pull request it cannot
compute a merge ref for, and a rebase often conflicts with the tree it
replaces: approving edera/mainline's #48 started nothing, and it had to
be landed by hand.

The land workflow can now also be run with a pull request number. It
then reads the head, branch and base from the pull request, requires
the same rebase/edera-6.18-lts/... branch into edera/6.18-lts, and
lands on the most recent approval of the current head from a reviewer
whose latest review is still an approval. Everything after that, the
write-access check, the tip check, the backup and the leased push, is
unchanged.
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.

1 participant