* linux-next: manual merge of the m68k tree
@ 2008-07-31 4:05 Stephen Rothwell
2008-07-31 7:02 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-07-31 4:05 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
Hi Geert,
Today's linux-next merge of the m68k tree got a conflict in init/main.c
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).
I took the version from Linus' tree.
--
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
* Re: linux-next: manual merge of the m68k tree
2008-07-31 4:05 linux-next: manual merge of the m68k tree Stephen Rothwell
@ 2008-07-31 7:02 ` Geert Uytterhoeven
2008-07-31 7:21 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2008-07-31 7:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Geert Uytterhoeven
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@linux-m68k•org
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the m68k tree
2008-07-31 7:02 ` Geert Uytterhoeven
@ 2008-07-31 7:21 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-07-31 7:21 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 1051 bytes --]
Hi Geert,
On Thu, 31 Jul 2008 09:02:17 +0200 (CEST) Geert Uytterhoeven <geert@linux-m68k•org> 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@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-07-31 7:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-31 4:05 linux-next: manual merge of the m68k tree Stephen Rothwell
2008-07-31 7:02 ` Geert Uytterhoeven
2008-07-31 7:21 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox