* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxx>") 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
--
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
