Hi Stephen,
On Thu, 31 Jul 2008, Stephen Rothwell wrote:
> Today's linux-next merge of the m68k tree got a conflict in init/main.c
Sorry, still haven't updated my queue after OLS...
> between commit bd673c7c3b1681dbfabab0062e67398dadf806af ("initrd: cast
> `initrd_start' to `void *'") from Linus' tree and commit
> d9c4ef589d1eda15333fb3d307bf4df85337820a ("initrd: Fix virtual/physical
> mix-up in overwrite test") from the m68k tree (which is also in Linus'
> tree).
Interesting, so git didn't notice that my version got merged, and an
additional patch was applied on top?
> I took the version from Linus' tree.
Yep, that's the correct one. Thx!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
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
