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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpCLWXdJwEGH.pgp
Description: PGP signature
