Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
init/main.c between commit 02af61bb50f5d5f0322dbe5ab2a0d75808d25c7b
("tracing, kmemtrace: Separate include/trace/kmemtrace.h to kmemtrace
part and tracepoint part") from the tracing tree and commit
e6a9527dba81973b8fe7000f42c84b2ffbe98d65 ("driver-core: devtmpfs - driver
core maintained /dev tmpfs") from the driver-core tree.
Just simple overlapping additions. I fixed it up (see below) and can
carry the fix as necessary.
[Aside: the first I can find of this is the patch submission to LKML
within the last day ... so "posted, reviewed, unit tested"? I assume
this has had some discussion somewhere, but Google doesn't know where.]
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc init/main.c
index cc61941,0d36b37..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -65,7 -64,7 +65,8 @@@
#include <linux/idr.h>
#include <linux/ftrace.h>
#include <linux/async.h>
+#include <linux/kmemtrace.h>
+ #include <linux/shmem_fs.h>
#include <trace/boot.h>
#include <asm/io.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
