linux-kernel - linux-next: manual merge of the h8300-remove 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>] [day] [month] [year] [list]

Message-Id: <20130916095618.ebbe64569b730dc9bd5593c5@canb.auug.org.au>
Date:	Mon, 16 Sep 2013 09:56:18 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Guenter Roeck <linux@...ck-us.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Martin Schwidefsky <schwidefsky@...ibm.com>
Subject: linux-next: manual merge of the h8300-remove tree with Linus' tree

Hi Guenter,

Today's linux-next merge of the h8300-remove tree got a conflict in
arch/h8300/Kconfig between commit 0244ad004a54 ("Remove GENERIC_HARDIRQ
config option") from Linus' tree and commit d02babe847bf ("Drop support
for Renesas H8/300 (h8300) architecture") from the h8300-remove tree.

I just removed the file and can carry the fix as necessary (no action is
required).

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

Content of type "application/pgp-signature" skipped