From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mundt <lethal@linux-sh•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Magnus Damm <damm@opensource•se>
Subject: linux-next: manual merge of the genesis tree with the sh tree
Date: Wed, 26 May 2010 11:23:31 +1000 [thread overview]
Message-ID: <20100526112331.cbd37c4b.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2010-05-26 1:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-26 1:23 Stephen Rothwell [this message]
2010-05-26 1:54 ` linux-next: manual merge of the genesis tree with the sh tree Paul Mundt
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=20100526112331.cbd37c4b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=damm@opensource$(echo .)se \
--cc=lethal@linux-sh$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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