From: Ian Molton <ian@mnementh.co.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Takashi Iwai <tiwai@suse.de>,
linux-next@vger.kernel.org, Eric Miao <eric.miao@marvell.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: linux-next: manual merge of the sound tree with the pxa tree
Date: Fri, 23 Jan 2009 03:08:06 +0000 [thread overview]
Message-ID: <49793496.2010908@mnementh.co.uk> (raw)
In-Reply-To: <20090123140130.eba111dd.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Takashi,
>
> Today's linux-next merge of the sound tree got a conflict in
> sound/soc/pxa/e800_wm9712.c between commit
> f638d6ae54b5dc1bbffaa1dd94cb288d989670af ("[ARM] pxa: remove unnecessary
> #include of pxa-regs.h and hardware.h") from the pxa tree and commit 0465c7aa6fbab89de820442aed449ceb8d9145a6 ("ASoC: machine driver for
> Toshiba e800") from the sound tree.
>
> Just overlapping context changes. I fixed it up (see below) and can
> carry the fix as necessary.
Looks good. If it needs acking, then
Acked-by: Ian Molton <ian@mnementh.co.uk>
-Ian
next prev parent reply other threads:[~2009-01-23 3:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-23 3:01 linux-next: manual merge of the sound tree with the pxa tree Stephen Rothwell
2009-01-23 3:08 ` Ian Molton [this message]
2009-01-23 11:31 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2009-02-10 3:22 Stephen Rothwell
2009-02-10 3:35 ` Eric Miao
2009-02-10 8:58 ` Takashi Iwai
2009-02-10 10:36 ` Stephen Rothwell
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=49793496.2010908@mnementh.co.uk \
--to=ian@mnementh.co.uk \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=eric.miao@marvell.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tiwai@suse.de \
/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.