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-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
