Skip to content

[3/4] Add chapter on merging back changes from XenServer patch-queue.#4

Merged
casasnovas merged 3 commits intomainfrom
quentin-xs-merge
Mar 16, 2026
Merged

[3/4] Add chapter on merging back changes from XenServer patch-queue.#4
casasnovas merged 3 commits intomainfrom
quentin-xs-merge

Conversation

@casasnovas
Copy link
Copy Markdown
Collaborator

@casasnovas casasnovas commented Mar 2, 2026

Our dom0 kernel will now diverge significantly from the XenServer one, as we will be rebasing it
on top of different upstream bases, and as such, we will have some extra challenges merging back
changes from XenServer patch-queue. A new script is added to facilitate this maintenance activity.

The rationale for diverging from XenServer dom0 kernel is discussed here for reference:

https://notes.vates.tech/s/vatesglobal/p/proposal-emancipation-from-xs-linux-kernel-for-xcp-ng-8-3-and-apply-WDv7wHUn8z

This pull-request is the third in a series adding tools and documentation on maintaining
our dom0 kernel - for extra context, the final state can be seen here (the final README
especially):

https://github.com/xcp-ng/hypervisor-dev/tree/quentin-main

I've tried to split the changes into palatable/reviewable PRs, full list:

@casasnovas casasnovas force-pushed the quentin-rebase-upstream branch from 28c2df0 to a3140ca Compare March 2, 2026 10:08
@casasnovas casasnovas force-pushed the quentin-rebase-upstream branch from a3140ca to 773782d Compare March 2, 2026 10:10
@casasnovas casasnovas force-pushed the quentin-xs-merge branch 2 times, most recently from f5a4cd3 to 6160dd8 Compare March 2, 2026 10:13
@casasnovas casasnovas force-pushed the quentin-rebase-upstream branch from 773782d to 66b28a3 Compare March 2, 2026 10:13
@casasnovas casasnovas force-pushed the quentin-xs-merge branch 2 times, most recently from 3ba28b4 to ca9121b Compare March 3, 2026 06:53
@casasnovas casasnovas force-pushed the quentin-rebase-upstream branch from 25a9731 to f8619ee Compare March 3, 2026 06:53
@casasnovas casasnovas marked this pull request as ready for review March 3, 2026 09:44
@casasnovas casasnovas requested a review from a team as a code owner March 3, 2026 09:44
@casasnovas casasnovas force-pushed the quentin-rebase-upstream branch 2 times, most recently from 693c028 to deab814 Compare March 12, 2026 08:31
@casasnovas casasnovas force-pushed the quentin-xs-merge branch 2 times, most recently from 371cbd3 to 29d1b6c Compare March 12, 2026 08:38
@casasnovas casasnovas force-pushed the quentin-rebase-upstream branch 2 times, most recently from f81b35a to 28a2185 Compare March 12, 2026 08:42
@fallen
Copy link
Copy Markdown

fallen commented Mar 12, 2026

I think this script needs:

  • a comment that explains what it does and how to use it, maybe a small example
  • (optional) arg parsing, at least so that the error is not something like line 5: $1: unbound variable, with a -h to show help/usage

EDIT: the script usage is explained externally in the README.md doc so maybe the explanation could be minimal in the script itself

@casasnovas casasnovas force-pushed the quentin-rebase-upstream branch from 28a2185 to b3647e2 Compare March 12, 2026 14:53
@casasnovas
Copy link
Copy Markdown
Collaborator Author

I think this script needs:

* a comment that explains what it does and how to use it, maybe a small example

* (optional) arg parsing, at least so that the error is not something like `line 5: $1: unbound variable`, with a -h to show help/usage

EDIT: the script usage is explained externally in the README.md doc so maybe the explanation could be minimal in the script itself

Indeed, I've added a comment banner with basic explanation (purpose and how to use) as well as a couple of pitfalls checks for the CLI but didn't go for full blown optarg parsing, let me know if that's enough for you or if you'd prefer optarg parsing.

@casasnovas casasnovas changed the base branch from quentin-rebase-upstream to main March 12, 2026 15:12
…ging back changes from XenServer.

Signed-off-by: Quentin Casasnovas <quentin.casasnovas@vates.tech>
…ueue.

Signed-off-by: Quentin Casasnovas <quentin.casasnovas@vates.tech>
…patch-queue.

Signed-off-by: Quentin Casasnovas <quentin.casasnovas@vates.tech>
@fallen
Copy link
Copy Markdown

fallen commented Mar 16, 2026

I think this script needs:

* a comment that explains what it does and how to use it, maybe a small example

* (optional) arg parsing, at least so that the error is not something like `line 5: $1: unbound variable`, with a -h to show help/usage

EDIT: the script usage is explained externally in the README.md doc so maybe the explanation could be minimal in the script itself

Indeed, I've added a comment banner with basic explanation (purpose and how to use) as well as a couple of pitfalls checks for the CLI but didn't go for full blown optarg parsing, let me know if that's enough for you or if you'd prefer optarg parsing.

That's good as it is now, thanks!

Copy link
Copy Markdown

@fallen fallen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@casasnovas casasnovas merged commit b1c25ef into main Mar 16, 2026
2 checks passed
@casasnovas casasnovas deleted the quentin-xs-merge branch March 16, 2026 14:55
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.

2 participants