From: eric.y.miao@gmail.com (Eric Miao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/8] [ARM] pxa: move ssp into common plat-pxa
Date: Tue, 16 Mar 2010 21:04:22 +0800 [thread overview]
Message-ID: <f17812d71003160604q38846792i18efbcf9fb7208f@mail.gmail.com> (raw)
In-Reply-To: <20100316125955.GB7287@rakim.wolfsonmicro.main>
On Tue, Mar 16, 2010 at 8:59 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Tue, Mar 16, 2010 at 08:49:51PM +0800, Haojian Zhuang wrote:
>
>> By the way, I'm still format other patches for share more code between
>> pxa2xx-ssp & pxa168-sssp. Since you're updating ssp. The ssp code will
>> be different between your git tree and mark's asoc git tree. If my
>> patches are merged into asoc git tree, how to sync to your git tree?
>
>> Mark,
>> do you have any comments on syncing code?
>
> As I keep say I believe we need to do an early merge of a topic branch
> that covers the common stuff into both the PXA and ASoC trees, otherwise
> we'll end up with conflicting lines of development and no way to resolve
> them until the merge down.
>
Mark,
So do you have any detailed plan in your mind? I'm basically thinking if
it's possible to setup a common topic branch with pxa-ssp changes to
be a common baseline for both trees.
next prev parent reply other threads:[~2010-03-16 13:04 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 [this message]
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
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=f17812d71003160604q38846792i18efbcf9fb7208f@mail.gmail.com \
--to=eric.y.miao@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).