linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20100323140946.b56c1d8b.sfr@canb.auug.org.au>
Date:	Tue, 23 Mar 2010 14:09:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jason Wessel <jason.wessel@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dmitry Torokhov <dmitry.torokhov@...il.com>
Subject: linux-next: manual merge of the kgdb tree with the input tree

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@...driver.com>".

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped