From: Ryan Mallon <rmallon@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Kosina <jkosina@suse.cz>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mika Westerberg <mika.westerberg@iki.fi>,
Vinod Koul <vinod.koul@intel.com>
Subject: Re: linux-next: manual merge of the trivial tree with the slave-dma tree
Date: Fri, 17 Jun 2011 12:56:02 +1000 [thread overview]
Message-ID: <4DFAC242.9090204@gmail.com> (raw)
In-Reply-To: <20110617125419.c196ca92.sfr@canb.auug.org.au>
On 17/06/11 12:54, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/mach-ep93xx/dma-m2p.c between commit 8e4a93008db7 ("ep93xx:
> remove the old M2P DMA code") from the slave-dma tree and commit
> 1c5454eed85a ("Change Ryan Mallon's email address across the kernel")
> from the trivial tree.
>
> The former removed the file, so I did that.
That is correct. Mika has added my new email address to the new ep93xx
dma files.
Thanks,
~Ryan
prev parent reply other threads:[~2011-06-17 2:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-17 2:54 linux-next: manual merge of the trivial tree with the slave-dma tree Stephen Rothwell
2011-06-17 2:56 ` Ryan Mallon [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=4DFAC242.9090204@gmail.com \
--to=rmallon@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.westerberg@iki.fi \
--cc=sfr@canb.auug.org.au \
--cc=vinod.koul@intel.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.