Hi Geert,
On Thu, 31 Jul 2008 09:02:17 +0200 (CEST) Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote:
>
> 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...
S'ok.
> > 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?
No, it noticed that the particular lines in that file got changed
differently by both sides of the merge. It doesn't notice that Linus'
tree and your tree changed it the same and then Linus' tree changed it
again.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpSlD8y3vlkp.pgp
Description: PGP signature
