Hi Rusty,
Today's linux-next merge of the boot-params tree got a conflict in
arch/sh/boards/mach-migor/setup.c between commit
2f75cd4d60aa955f983134f7ceb656b1b8cb8c30 ("sh: mach-migor: Kill off
unused Migo-R machvec") from the sh tree and commit
0de5c2d9f02d2018fd671ca1015432dffa5eb338 ("param:
arch_get_boot_command_line()") from the boot-params tree.
The former removes the code that the latter modified.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpHFIgq7ar69.pgp
Description: PGP signature
