From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Al Viro <viro@zeniv.linux.org.uk>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the cortex tree with Linus' tree
Date: Tue, 16 Oct 2012 08:51:49 +0200 [thread overview]
Message-ID: <20121016065149.GO639@pengutronix.de> (raw)
In-Reply-To: <20121016132052.0ac9f1f6b3fcbe946503793c@canb.auug.org.au>
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/ |
next prev parent reply other threads:[~2012-10-16 6:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-16 2:20 linux-next: manual merge of the cortex tree with Linus' tree Stephen Rothwell
2012-10-16 6:51 ` Uwe Kleine-König [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-10-16 2:20 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121016065149.GO639@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).