Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git # Conflicts: # arch/x86/include/asm/paravirt_types.h # arch/x86/include/asm/percpu.h