Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in
arch/arm64/mm/dump.c between commit 284be28565ef ("arm64: dump: Fix
implicit inclusion of definition for PCI_IOBASE") from Linus' tree and
commit 764011ca8247 ("arm64: mm: dump: add missing includes") from the
arm64 tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc arch/arm64/mm/dump.c index d54dc9ac4b70,bbc5a29ecaaf..000000000000 --- a/arch/arm64/mm/dump.c +++ b/arch/arm64/mm/dump.c @@@ -14,8 -14,9 +14,10 @@@ * of the License. */ #include <linux/debugfs.h> + #include <linux/errno.h> #include <linux/fs.h> + #include <linux/init.h> +#include <linux/io.h> #include <linux/mm.h> #include <linux/sched.h> #include <linux/seq_file.h>
pgpLQyvpoYcYR.pgp
Description: OpenPGP digital signature
