Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
kernel/stop_machine.c between commit
4403b406d4369a275d483ece6ddee0088cc0d592 ("Revert "Call init_workqueues
before pre smp initcalls."") from Linus' tree and commit
b9d4c68d4c404c48c20380ff25fd8c0202921a96 ("commit a802dd0e breaks console
keyboard input") from the rr tree.
Two different fixes. I used the one in the rr tree for now.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgplVc6EYdn6x.pgp
Description: PGP signature
