* linux-next: manual merge of the genesis tree with the sh tree
@ 2010-05-26 1:23 Stephen Rothwell
2010-05-26 1:54 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-05-26 1:23 UTC (permalink / raw)
To: Paul Mundt; +Cc: linux-next, linux-kernel, Magnus Damm
[-- Attachment #1: Type: text/plain, Size: 575 bytes --]
Hi Paul,
Today's linux-next merge of the genesis tree got a conflict in
include/linux/serial_sci.h between commit
14baf9d7f275f0bbf42c1216ff1eef1109ca42ba ("serial: sh-sci: fix up serial
DMA build") from the sh tree and commit
927a7c9c1793def3a55d60c926d3945528e6bf1b ("dmaengine: shdma: Enable on
SH-Mobile ARM") from the genesis tree.
I used the version from the sh tree (i.e. no "#ifdef
CONFIG_SERIAL_SH_SCI_DMA" around the include of linux/sh_dma.h).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the genesis tree with the sh tree
2010-05-26 1:23 linux-next: manual merge of the genesis tree with the sh tree Stephen Rothwell
@ 2010-05-26 1:54 ` Paul Mundt
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2010-05-26 1:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Magnus Damm
On Wed, May 26, 2010 at 11:23:31AM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the genesis tree got a conflict in
> include/linux/serial_sci.h between commit
> 14baf9d7f275f0bbf42c1216ff1eef1109ca42ba ("serial: sh-sci: fix up serial
> DMA build") from the sh tree and commit
> 927a7c9c1793def3a55d60c926d3945528e6bf1b ("dmaengine: shdma: Enable on
> SH-Mobile ARM") from the genesis tree.
>
Sorry about that, I needed the fix in the sh tree since the genesis tree
hadn't been merged yet, so the interdependencies have created a bit of a
mess.
> I used the version from the sh tree (i.e. no "#ifdef
> CONFIG_SERIAL_SH_SCI_DMA" around the include of linux/sh_dma.h).
Sounds good, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-26 1:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-26 1:23 linux-next: manual merge of the genesis tree with the sh tree Stephen Rothwell
2010-05-26 1:54 ` Paul Mundt
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).