Hi all,
Today's linux-next merge of the header_cleanup tree got a conflict in:
arch/x86/include/asm/paravirt_types.h
between commit:
f7af6977621a ("x86/paravirt: Remove no longer needed paravirt patching code")
from the tip tree and commit:
9483c05522c6 ("arch/x86: fix missing includes/forward declarations")
from the header_cleanup tree.
I fixed it up (I think, see below) and can carry the fix as necessary.
This is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/include/asm/paravirt_types.h
index d8e85d2cf8d5,3cfcd5db083b..000000000000
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@@ -5,6 -5,17 +5,7 @@@
#ifdef CONFIG_PARAVIRT
#ifndef __ASSEMBLY__
++#include <linux/types.h>
#include <asm/desc_defs.h>
#include <asm/pgtable_types.h>
Attachment:
pgpbP4cdBi1nd.pgp
Description: OpenPGP digital signature
