From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@elte•hu>
Cc: linux-next@vger•kernel.org,
Arjan van de Ven <arjan@linux•intel.com>,
Dave Hansen <haveblue@us•ibm.com>, Greg KH <greg@kroah•com>
Subject: linux-next: manual merge of the fastboot tree
Date: Fri, 15 Aug 2008 17:44:15 +1000 [thread overview]
Message-ID: <20080815174415.985eb69c.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]
Hi Ingo,
Today's linux-next merge of the fastboot tree got a trivial conflict in include/linux/init.h between commit 95fc5687f58152d62904e7dea36dca3a52514160 ("Dave Hansen <haveblue@us•ibm.com>") from the driver-core tree and commit a06e1c2b448b317bc141934879cbbbed8319b4d4 ("modules: extend initcall_debug functionality to the module loader") from the fastboot tree.
Just overlapping additions. I fixed it up and will carry the fix.
[I have been asked to try adding the merge result diff, so just as a test
I have included it below.]
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc include/linux/init.h
index de1d690,b6201c0..0000000
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@@ -143,7 -143,8 +143,9 @@@ extern int do_one_initcall(initcall_t f
extern char __initdata boot_command_line[];
extern char *saved_command_line;
extern unsigned int reset_devices;
+extern int initmem_now_dynamic;
+ extern int do_one_initcall(initcall_t fn);
+
/* used by init/main.c */
void setup_arch(char **);
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-08-15 7:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-15 7:44 Stephen Rothwell [this message]
2008-08-15 7:50 ` linux-next: manual merge of the fastboot tree Ingo Molnar
2008-08-15 7:57 ` 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=20080815174415.985eb69c.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arjan@linux$(echo .)intel.com \
--cc=greg@kroah$(echo .)com \
--cc=haveblue@us$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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