From: santosh.shilimkar@ti•com (Santosh Shilimkar)
To: linux-arm-kernel@lists•infradead.org
Subject: linux-next: manual merge of the keystone tree with the arm-soc tree
Date: Mon, 24 Mar 2014 20:00:03 -0400 [thread overview]
Message-ID: <5330C703.5030705@ti.com> (raw)
In-Reply-To: <20140325105501.e63fcdd78d0d604b4e5309a1@canb.auug.org.au>
On Monday 24 March 2014 07:55 PM, Stephen Rothwell wrote:
> Hi Santosh,
>
> Today's linux-next merge of the keystone tree got a conflict in
> arch/arm/boot/dts/Makefile between commit ba5a37e52194 ("ARM: mvebu: Move
> kirkwood DT boards into mach-mvebu") from the arm-soc tree and commit
> 400550ae7e77 ("ARM: dts: Build all keystone dt blobs") from the keystone
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Looks fine. Thanks
Regards,
Santosh
next prev parent reply other threads:[~2014-03-25 0:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-24 23:55 linux-next: manual merge of the keystone tree with the arm-soc tree Stephen Rothwell
2014-03-25 0:00 ` Santosh Shilimkar [this message]
2014-03-25 1:23 ` Felipe Balbi
2014-03-25 13:17 ` Santosh Shilimkar
-- strict thread matches above, loose matches on Subject: below --
2017-10-30 12:05 Mark Brown
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=5330C703.5030705@ti.com \
--to=santosh.shilimkar@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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