public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Takashi Iwai <tiwai@suse•de>
To: Kukjin Kim <kgene.kim@samsung•com>
Cc: '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: Thu, 23 Dec 2010 15:30:26 +0100	[thread overview]
Message-ID: <s5h7hf0tvct.wl%tiwai@suse.de> (raw)
In-Reply-To: <004101cba294$8639de30$92ad9a90$%kim@samsung.com>

At Thu, 23 Dec 2010 20:28:27 +0900,
Kukjin Kim wrote:
> 
> Takashi Iwai wrote:
> > 
> 
> (snip)
> 
> > > > > Anyway I need above commits from sound-2.6.git in my tree...
> > > > > so how method is better to me instead of cherry-pick it?
> > > >
> > > > You can merge topic/asoc branch of sound git tree.
> > > > This brach contains the all necessary commits for ASoC and is almost
> > > > never rebased.
> > >
> > > Hi,
> > >
> > > But I can't merge it because there is no 'topic/asoc' branch in
> > > sound-2.6.git.
> > > (git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git)
> > >
> > > Is there another repository?
> > 
> > OK, Mark's tree doesn't contain.  But you can merge for-2.6.38 tree there.
> > 
> > The main sound git tree is found in
> >     git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
> > 
> Aha~ :-)
> 
> > > And should I merge it in my tree even though don't need all of ASoC
> commits
> > > :-( ?
> > 
> > In general yes because this is the tree to be merged to 2.6.38.
> > 
> Yeah, I know it.
> 
> > > I'm not sure how many commits are in there...
> > 
> > You can keep two branches.  One contains only your fixes, and another
> > is the merged branch from yours and from sound git tree.  Expose the
> > latter merged tree for linux-next.
> > 
> Yeah...however, firstly, my tree will be sent to rmk during 38 merge window,
> if I merge from sound git, for avoiding build error I should send all
> including them not only my patches. I think there is no need to rmk...hmm
> 
> So I did 'cherry-pick' only needed 2 commits in my tree.

And that caused problems :)

> > There are many other ways to manage such things, but the above has
> > worked for me well, at least.
> 
> Yeah I think so...but is there another better way in this case? Hehehe...

Well, ideally, create a separate branch containing these cross-tree
commits based on vanilla.  Then pull this branch to both arm (or your)
and sound trees.  In that way, both trees share the same commits in
the least amount.

I basically don't like to rebase and the commits have been already in
sound tree, but if this is the only way and Russell prefers this, it
can be a possible option.


thanks,

Takashi

next prev parent reply	other threads:[~2010-12-23 14:30 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 [this message]
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
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=s5h7hf0tvct.wl%tiwai@suse.de \
    --to=tiwai@suse$(echo .)de \
    --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=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox