Re: linux-next: manual merge of the kgdb tree with the input tree

[Jason Wessel]

On 10/05/2010 09:04 PM, Stephen Rothwell wrote:
> Hi Jason,
>
> Today's linux-next merge of the kgdb tree got a conflict in
> drivers/char/sysrq.c between commit
> 1966cb225c6f9040ca163802cbd052c393d4448f ("Input: sysrq - add locking to
> sysrq_filter()") from the input tree and commit
> 02307772717c91a108aca2e999bbc586a85d06a2 ("sysrq,keyboard: properly deal
> with alt-sysrq in sysrq input filter") from the kgdb tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fax as
> necessary.
>   

Thanks Stephen,

Hopefully I can get the sysrq / keyboard patches out of my tree and into
Dmitry's tree which should fix the problem by design. :-)

Thanks,
Jason.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/