From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Timur Tabi <timur@freescale.com>,
Kumar Gala <galak@kernel.crashing.org>
Subject: Re: linux-next: manual merge of the sound-asoc tree with Linus' tree
Date: Fri, 15 Oct 2010 11:04:52 +0100 [thread overview]
Message-ID: <20101015100452.GB14782@rakim.wolfsonmicro.main> (raw)
In-Reply-To: <20101015115251.015b08d5.sfr@canb.auug.org.au>
On Fri, Oct 15, 2010 at 11:52:51AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/powerpc/platforms/85xx/p1022_ds.c between commit
> dc1c41f450a5f201f1d8c19aef32319f3b84c273 ("powerpc/85xx: Fix compile
> issue with p1022_ds due to lmb rename to memblock") from Linus' tree and
> commit 2c184cd393d1410bb43ac656a6480849fe886b1d ("powerpc/85xx: add DIU
> support to the Freecale P1022DS reference board") from the sound-asoc
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
I had to apply the reverse of that to to apply on ASoC so this looks to
be the best fix :)
next prev parent reply other threads:[~2010-10-15 10:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-15 0:52 linux-next: manual merge of the sound-asoc tree with Linus' tree Stephen Rothwell
2010-10-15 10:04 ` Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-15 1:32 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=20101015100452.GB14782@rakim.wolfsonmicro.main \
--to=broonie@opensource.wolfsonmicro.com \
--cc=galak@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=sfr@canb.auug.org.au \
--cc=timur@freescale.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox