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

Message-ID: <20121016065149.GO639@pengutronix.de>
Date:	Tue, 16 Oct 2012 08:51:49 +0200
From:	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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: Re: linux-next: manual merge of the cortex tree with Linus' tree

On Tue, Oct 16, 2012 at 01:20:52PM +1100, Stephen Rothwell wrote:
> 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.
I'll look into it and rebase accordingly.

Thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
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/