# Conflicts:
#	arch/riscv/include/asm/io.h
#	arch/x86/kernel/paravirt.c
#	arch/x86/mm/pgtable.c
#	drivers/mailbox/mailbox.c
#	lib/vdso/datastore.c
#	net/core/dev.c