Hi all,
Today's linux-next merge of the tracing tree got a conflict in
kernel/irq/handle.c between commit
0fa0ebbf15addc1be8f73325d809c8547a9de304 ("irq: allocate irq_desc_ptrs
array based on nr_irqs") from the cpus4096 tree and commit
af39241b90a345556b8884adff87096afe71b050 ("tracing, genirq: add irq enter
and exit trace events") from the tracing tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/irq/handle.c
index f51eaee,4709a7c..0000000
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@@ -17,7 -17,7 +17,8 @@@
#include <linux/kernel_stat.h>
#include <linux/rculist.h>
#include <linux/hash.h>
+#include <linux/bootmem.h>
+ #include <trace/irq.h>
#include "internals.h"
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
