Hi Jason, Today's linux-next merge of the kgdb tree got a conflict in kernel/debug/kdb/kdb_main.c between commit edd63cb6b91024332d6983fc51058ac1ef0c081e ("sysrq,kdb: Use __handle_sysrq () for kdb's sysrq function") from Linus' tree and commit 93c47fada46e034941106fb34b76a00a87108fc5 ("kdb: Restore previous sysrq state") from the kgdb tree. These are two fixes for the same problem. I effectively reverted the one from the kgdb tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpY24MykMrRD.pgp
Description: PGP signature