* linux-next: manual merge of the fastboot tree
@ 2008-08-15 7:44 Stephen Rothwell
2008-08-15 7:50 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-08-15 7:44 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Arjan van de Ven, Dave Hansen, Greg KH
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the fastboot tree
2008-08-15 7:44 linux-next: manual merge of the fastboot tree Stephen Rothwell
@ 2008-08-15 7:50 ` Ingo Molnar
2008-08-15 7:57 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2008-08-15 7:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Arjan van de Ven, Dave Hansen, Greg KH
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> 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
[ sidenote: interesting commit name ;-) ]
> 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.
thanks.
> [I have been asked to try adding the merge result diff, so just as a
> test I have included it below.]
that's a very good idea!
[ The inlining seems a bit weird though - Mutt didnt show it in its
default form, it only showed up when i did a reply to the mail.
Strange. I use mutt-1.5.18-2.fc8. ]
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the fastboot tree
2008-08-15 7:50 ` Ingo Molnar
@ 2008-08-15 7:57 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-08-15 7:57 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Arjan van de Ven, Dave Hansen, Greg KH
[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]
Hi Ingo,
On Fri, 15 Aug 2008 09:50:06 +0200 Ingo Molnar <mingo@elte•hu> wrote:
>
> * Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > 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
>
> [ sidenote: interesting commit name ;-) ]
:-)
"warn when statically-allocated kobjects are used"
> > [I have been asked to try adding the merge result diff, so just as a
> > test I have included it below.]
>
> that's a very good idea!
>
> [ The inlining seems a bit weird though - Mutt didnt show it in its
> default form, it only showed up when i did a reply to the mail.
> Strange. I use mutt-1.5.18-2.fc8. ]
Probably a side effect of the fact that I GPG sign most of my emails. I
usually don't do that when I include a patch.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-08-15 7:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-15 7:44 linux-next: manual merge of the fastboot tree Stephen Rothwell
2008-08-15 7:50 ` Ingo Molnar
2008-08-15 7:57 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox