From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the kbuild tree with the arm-soc tree
Date: Tue, 7 Oct 2014 09:56:34 +0200 [thread overview]
Message-ID: <54339CB2.9010202@atmel.com> (raw)
In-Reply-To: <20141007123926.0e14810b@canb.auug.org.au>
On 07/10/2014 03:39, Stephen Rothwell :
> Hi Michal,
>
> Today's linux-next merge of the kbuild tree got a conflict in
> arch/arm/mach-at91/Makefile between commit 91a55d4f6900 ("ARM: at91:
> introduce OLD_IRQ_AT91 Kconfig option") from the arm-soc tree and
> commit ac84eb47cc19 ("kbuild: remove unnecessary variable
> initializaions") from the kbuild tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix is good. Thanks Stephen.
Bye,
--
Nicolas Ferre
next prev parent reply other threads:[~2014-10-07 7:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-07 1:39 linux-next: manual merge of the kbuild tree with the arm-soc tree Stephen Rothwell
2014-10-07 7:56 ` Nicolas Ferre [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-28 1:58 Stephen Rothwell
2014-12-05 3:17 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=54339CB2.9010202@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).