linux-kernel - linux-next: manual merge of the cortex 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]

Message-Id: <20121016132052.0ac9f1f6b3fcbe946503793c@canb.auug.org.au>
Date:	Tue, 16 Oct 2012 13:20:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Uwe Kleine-König" 
	<u.kleine-koenig@...gutronix.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@...iv.linux.org.uk>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the cortex tree with Linus' tree

Hi Uwe,

Today's linux-next merge of the cortex tree got a conflict in
arch/arm/kernel/process.c between commit 9e14f828ee4a ("arm: split
ret_from_fork, simplify kernel_thread() [based on patch by rmk]") from
Linus' tree and commit 2f3e7d3436cb ("Cortex-M3: Add support for
exception handling") from the cortex tree.

I have no idea how to fix this up, so I have just dropped this tree for
today.

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

Content of type "application/pgp-signature" skipped