From: Mark Brown <broonie@opensource•wolfsonmicro.com>
To: Kukjin Kim <kgene.kim@samsung•com>
Cc: 'Russell King' <rmk@arm•linux.org.uk>,
'Takashi Iwai' <tiwai@suse•de>,
'Stephen Rothwell' <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Jassi Brar' <jassi.brar@samsung•com>
Subject: Re: linux-next: manual merge of the sound tree with the s5p tree
Date: Tue, 28 Dec 2010 15:39:48 +0000 [thread overview]
Message-ID: <20101228153948.GB14860@sirena.org.uk> (raw)
In-Reply-To: <018b01cba636$6c3a8390$44af8ab0$%kim@samsung.com>
On Tue, Dec 28, 2010 at 11:24:49AM +0900, Kukjin Kim wrote:
> Takashi, as Russell's first option, could you please make some branch which
> includes following to me?
Please keep myself and Liam in the CC on all ASoC discussion.
> Of course, I know you need rebase you tree for it...so sorry for bothering.
This isn't going to help as it will just introduce the same duplicate
commits issue into the sound tree. I'm still not clear what the
affected commits actually are but given that Stephen's original report
indicated that the ASoC changes are subsets of your changes would it not
make sense to just drop the relevant commits from your tree (which seems
to be rebased often, unlike the sound tree which doesn't rebase)?
Another option is to do a second round of merges after both sound and
ALSA trees with whatever the dependant commits are.
next prev parent reply other threads:[~2010-12-28 15:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-23 0:53 linux-next: manual merge of the sound tree with the s5p tree Stephen Rothwell
2010-12-23 10:31 ` Kukjin Kim
2010-12-23 11:03 ` Takashi Iwai
2010-12-23 11:11 ` Kukjin Kim
2010-12-23 11:17 ` Takashi Iwai
2010-12-23 11:28 ` Kukjin Kim
2010-12-23 14:30 ` Takashi Iwai
2010-12-24 1:32 ` Kukjin Kim
2010-12-24 8:27 ` Russell King
2010-12-28 2:24 ` Kukjin Kim
2010-12-28 15:39 ` Mark Brown [this message]
2010-12-28 16:23 ` Russell King
2010-12-28 16:40 ` Mark Brown
2010-12-30 0:54 ` Kukjin Kim
2010-12-23 11:50 ` Mark Brown
2010-12-23 11:54 ` Piotr Hosowicz
2010-12-23 11:56 ` Mark Brown
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=20101228153948.GB14860@sirena.org.uk \
--to=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=jassi.brar@samsung$(echo .)com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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