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: Wed, 17 Mar 2010 13:14:39 +0800 [thread overview]
Message-ID: <f17812d71003162214y10e98491v928b5c51d1bf2616@mail.gmail.com> (raw)
In-Reply-To: <20100316140834.GB9365@rakim.wolfsonmicro.main>
On Tue, Mar 16, 2010 at 10:08 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Tue, Mar 16, 2010 at 09:47:58PM +0800, Eric Miao wrote:
>
>> After that, there could be only minor changes, which could be easily
>> merged either way, and I'd be happy to see ASoC tree add good
>> support the pxa ssp. So what I'm thinking now is actually which one
>> is easier, to merge asoc into pxa and get ssp cleaned up or to rebase
>> asoc onto this ssp cleanup branch. I might need to take a look into
>> what's going on inside asoc to evaluate this.
>
> Rebasing isn't an option for ASoC - it gets merged into Takashi's tree
> for one thing (and I don't see any reason why rebasing would be required
> anyway, no point in discarding history). ?A merge into ASoC should be
> sufficient, right now there's no changes at all in the SSP code against
> Linus' tree so that'll be trivial anyway at the minute.
>
> There's also no need to pick one route for the merge - if we do merges
> and avoid rebasing then git will cope fine.
>
Mark,
I'm seeing no merge conflict between my ssp_cleanup and Takashi's
latest tree, which branch do you suggest to merge then?
next prev parent reply other threads:[~2010-03-17 5:14 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 [this message]
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=f17812d71003162214y10e98491v928b5c51d1bf2616@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).