auto-x86-next: Tidy up the file
- Add explanations,
- move x86/merge separately, because like x86/urgent it's special,
- keep the list sorted alphabetically.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/.tip/auto-branches/auto-x86-next b/.tip/auto-branches/auto-x86-next
index cfcb3c6..6170b65 100644
--- a/.tip/auto-branches/auto-x86-next
+++ b/.tip/auto-branches/auto-x86-next
@@ -1,7 +1,11 @@
# x86 branches for integration
+# Pending fixes for upstream:
x86/urgent
+# Continuous integration merge-helper branch, do not send upstream:
+x86/merge
+
x86/alternatives
x86/apic
x86/asm
@@ -33,8 +37,7 @@
x86/sgx
x86/shstk
x86/splitlock
-x86/timers
x86/tdx
+x86/timers
x86/vdso
x86/vmware
-x86/merge