[edera-rebase-app]

Nightly rebase of edera/mainline (017f96b23bf1) onto master (126ad898a6e9), 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 017f96b23bf1, 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	017f96b23bf1
New tip	80deb724344e
Old upstream base	864c07de0c7d
New upstream base	126ad898a6e9

• New branch is based on the upstream tip.
• Downstream series is linear.
• All 94 downstream commits replayed; 2 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)

• ea62ac9f1b0f iommu/xen: Add Xen PV-IOMMU driver → f9eff6c0d58b
• bd1c0dba57c3 sysctl: wire up PaX softmode setting → d41e71775b54

Drift (changed lines: upstream delta vs. actual change)

--- upstream-lines
+++ actual-lines
@@ -735732,6 +735732,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",
@@ -735779,6 +735791,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;
 +}
@@ -735812,6 +735827,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
 -	{
@@ -735861,6 +735888,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;
 -}

Claude's report

Claude left no report (rebase step: success).

Waiting for the x86_64 build to finish.