linux-kernel - linux-next: manual merge of the kgdb tree with Linus' 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]

Date:	Fri, 23 Jul 2010 12:26:46 +1000
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
Subject: linux-next: manual merge of the kgdb tree with Linus' tree

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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped