Hi Jason,
Today's linux-next merge of the kgdb tree got a conflict in
drivers/char/keyboard.c between commit
edc6e384f9d96e54a6d03068d3b03fa5b56b6449 ("Input: implement SysRq as a
separate input handler") from the input tree and commit
4e4b600bf7160c11893bc3f4f8da8a70777b23ba ("When issuing an alt-sysrq-KEY
sequence with the keyboard driver in the")
from the kgdb tree.
The latter changes code moved to another file by the former. I don't
know how to fix this up, so I have just effectively reverted the kgdb
commit for now - suggestions welcome.
BTW, the author of that kgdb commit is "Jason Wessel Subject: [PATCH]
<jason.wessel@xxxxxxxxxxxxx>".
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpgx8ka7NpmP.pgp
Description: PGP signature
