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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <4CAC68C1.1070706@windriver.com>
Date:	Wed, 06 Oct 2010 07:17:05 -0500
From:	Jason Wessel <jason.wessel@...driver.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dmitry Torokhov <dmitry.torokhov@...il.com>
Subject: Re: linux-next: manual merge of the kgdb tree with the input tree

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/