Hi Linus, UML doesn't have a lot of changes this time around, as you can see in the diffstat and tag message below. I tested a merged and booted it, there should be no conflicts.
Please pull and let us know if there's any problem. Thanks, johannes The following changes since commit 76eeb9b8de9880ca38696b2fb56ac45ac0a25c6c: Linux 6.17-rc5 (2025-09-07 14:22:57 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git tags/uml-for-linux-6.18-rc1 for you to fetch changes up to e66ae377fe219c98d3d5b8a0d35da4413a5390ca: um: Remove unused ipi_pipe field from cpuinfo_um (2025-09-10 14:23:58 +0200) ---------------------------------------------------------------- updates for UML, notably - minor preparations for SMP support - SPARSE_IRQ support for kunit - help output cleanups ---------------------------------------------------------------- Johannes Berg (1): um: virtio-pci: implement .shutdown() Sinan Nalkaya (1): um: Support SPARSE_IRQ Tiwei Bie (10): um: Add missing trailing newline to help messages um: vector: Fix indentation for help message um: Fix help message for ssl-non-raw um: Indent time-travel help messages um: Remove unused offset and child_err fields from stub_data um: Remove outdated comment about STUB_DATA_PAGES um: Centralize stub size calculations um: Stop tracking virtual CPUs via mm_cpumask() um: Remove unused cpu_data and current_cpu_data macros um: Remove unused ipi_pipe field from cpuinfo_um arch/um/Kconfig | 1 + arch/um/drivers/ssl.c | 5 ++++- arch/um/drivers/ubd_kern.c | 2 +- arch/um/drivers/vector_kern.c | 2 +- arch/um/drivers/virtio_pcidev.c | 6 ++++++ arch/um/include/asm/mmu_context.h | 11 ---------- arch/um/include/asm/processor-generic.h | 3 --- arch/um/include/shared/as-layout.h | 5 +++-- arch/um/include/shared/skas/stub-data.h | 3 +-- arch/um/kernel/dtb.c | 2 +- arch/um/kernel/irq.c | 5 +++++ arch/um/kernel/time.c | 37 +++++++++++++++++---------------- arch/um/kernel/um_arch.c | 7 +------ arch/um/os-Linux/skas/process.c | 2 +- arch/x86/um/shared/sysdep/stub_32.h | 2 +- arch/x86/um/shared/sysdep/stub_64.h | 2 +- 16 files changed, 46 insertions(+), 49 deletions(-)
