From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, Kay Sievers <kay.sievers@vrfy.org>,
Jan Blunck <jblunck@suse.de>,
Andrew Morton <akpm@linux-foundation.org>
Subject: linux-next: manual merge of the driver-core tree with the tracing tree
Date: Fri, 1 May 2009 15:01:15 +1000 [thread overview]
Message-ID: <20090501150115.ce386142.sfr@canb.auug.org.au> (raw)
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@canb.auug.org.au
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>
next reply other threads:[~2009-05-01 5:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-01 5:01 Stephen Rothwell [this message]
2009-05-01 5:22 ` linux-next: manual merge of the driver-core tree with the tracing tree Greg KH
2009-05-02 5:13 ` linux-next procedures: (Was: Re: linux-next: manual merge of the driver-core tree with the tracing tree) Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090501150115.ce386142.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=greg@kroah.com \
--cc=jblunck@suse.de \
--cc=kay.sievers@vrfy.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).