From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the slave-dma tree with the arm-soc tree
Date: Thu, 19 Mar 2015 10:10:50 +0900 [thread overview]
Message-ID: <20150319011048.GA14051@verge.net.au> (raw)
In-Reply-To: <20150318120347.21288162@canb.auug.org.au>
On Wed, Mar 18, 2015 at 12:03:47PM +1100, Stephen Rothwell wrote:
> Hi Vinod,
>
> Today's linux-next merge of the slave-dma tree got a conflict in
> arch/arm/mach-shmobile/board-mackerel.c between commit a521422ea4ae
> ("ARM: shmobile: mackerel: Remove Legacy C board code") from the
> arm-soc tree and commit c078c62a7528 ("mmc: sh_mobile_sdhi: remove
> sh_mobile_sdhi_info v2") from the slave-dma tree.
>
> I fixed it up (the former removed the file, so I did that) and can
> carry the fix as necessary (no action is required).
Thanks Stephen,
my understanding is that the plan is to correct the file in Vinod's tree
even thought it is removed in mine. Your fix is correct from my point of view.
next prev parent reply other threads:[~2015-03-19 1:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-18 1:03 linux-next: manual merge of the slave-dma tree with the arm-soc tree Stephen Rothwell
2015-03-19 1:10 ` Simon Horman [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-04 10:44 Stephen Rothwell
2019-09-04 21:34 ` Arnd Bergmann
2011-12-21 1: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=20150319011048.GA14051@verge.net.au \
--to=horms@verge.net.au \
--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).