* linux-next: manual merge of the slave-dma tree with the renesas tree
@ 2015-03-18 1:03 Stephen Rothwell
2015-03-18 11:16 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2015-03-18 1:03 UTC (permalink / raw)
To: Vinod Koul, Simon Horman
Cc: linux-next, linux-kernel, Geert Uytterhoeven, Ulrich Hecht,
Kuninori Morimoto
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the slave-dma tree with the renesas tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2015-03-18 11:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Simon Horman, linux-next, linux-kernel, Geert Uytterhoeven,
Ulrich Hecht, Kuninori Morimoto
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-18 11:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox