From: Vinod Koul <vinod.koul@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Simon Horman <horms@verge.net.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>,
Ulrich Hecht <ulrich.hecht+renesas@gmail.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Subject: Re: linux-next: manual merge of the slave-dma tree with the renesas tree
Date: Wed, 18 Mar 2015 16:46:50 +0530 [thread overview]
Message-ID: <20150318111650.GI32683@intel.com> (raw)
In-Reply-To: <20150318120322.6a08816e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 619 bytes --]
On Wed, Mar 18, 2015 at 12:03:22PM +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-ape6evm.c between commit 9d07d414d4c3
> ("ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform") from the
> renesas 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 for reporting,
Yes the fix is the right one.
--
~Vinod
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2015-03-18 11:20 UTC|newest]
Thread overview: 2+ 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 renesas tree Stephen Rothwell
2015-03-18 11:16 ` Vinod Koul [this message]
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=20150318111650.GI32683@intel.com \
--to=vinod.koul@intel.com \
--cc=geert+renesas@glider.be \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=ulrich.hecht+renesas@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.