From: broonie@opensource.wolfsonmicro.com (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa
Date: Wed, 17 Mar 2010 10:05:38 +0000 [thread overview]
Message-ID: <20100317100538.GC13166@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <f17812d71003162214y10e98491v928b5c51d1bf2616@mail.gmail.com>
On Wed, Mar 17, 2010 at 01:14:39PM +0800, Eric Miao wrote:
> I'm seeing no merge conflict between my ssp_cleanup and Takashi's
> latest tree, which branch do you suggest to merge then?
I'm not sure what you're asking here but if you're looking for any
incompatible changes in ASoC they've not been implemented yet, the issue
is that due to the stuff Liam is working on at the minute there are
likely to be incompatible changes in the current release cycle which
would mean that merging new drivers (like Haojian posted) via a non-ALSA
tree would lead to problems after the trees are been merged together.
next prev parent reply other threads:[~2010-03-17 10:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-16 11:52 [PATCH 0/8] pxa: ssp code cleanup Eric Miao
2010-03-16 11:52 ` [PATCH 1/8] input: remove now deprecated corgi_ts.c touchscreen driver Eric Miao
2010-03-16 11:52 ` [PATCH 2/8] [ARM] pxa: remove now un-used corgi_ssp.c and corgi_lcd.c Eric Miao
2010-03-16 11:52 ` [PATCH 3/8] [ARM] pxa: remove the now legacy SSP API Eric Miao
2010-03-16 11:52 ` [PATCH 4/8] [ARM] pxa: correct SSCR0_SCR to support multiple SoCs Eric Miao
2010-03-16 11:52 ` [PATCH 5/8] [ARM] pxa: merge regs-ssp.h into ssp.h Eric Miao
2010-03-16 11:52 ` [PATCH 6/8] [ARM] pxa: remove unnecessary #include of <mach/ssp.h> Eric Miao
2010-03-16 11:52 ` [PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa Eric Miao
2010-03-16 12:49 ` Haojian Zhuang
2010-03-16 12:59 ` Mark Brown
2010-03-16 13:04 ` Eric Miao
2010-03-16 13:23 ` Mark Brown
2010-03-16 13:47 ` Eric Miao
2010-03-16 14:08 ` Mark Brown
2010-03-17 5:14 ` Eric Miao
2010-03-17 10:05 ` Mark Brown [this message]
2010-03-17 14:07 ` Eric Miao
2010-03-17 14:18 ` Haojian Zhuang
2010-03-17 14:32 ` Mark Brown
2010-03-17 14:09 ` Haojian Zhuang
2010-03-16 11:52 ` [PATCH 8/8] [ARM] pxa: remove incorrect select PXA_SSP in Kconfig Eric Miao
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=20100317100538.GC13166@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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.