threads / discuss / 4830

newbie'ish FAQ/question about merging different trees

Subject: newbie'ish FAQ/question about merging different trees

## tl;dr

3 messages between Jul 10, 2006 and Jul 10, 2006.

replies: 2people: 2as markdown or json

Peter Gervai· Jul 10, 2006, 11:56 UTC · lore
Hello,

I ask with specifics to make it easier to get, but the question probably general.

In one sentence: I would like to use linux/kernel/git/jejb/aic94xx-sas-2.6.git with the current released kernel, which is 2.6.17.4 at the moment.

In more sentences: There are two trees on kernel.org's git:

linux/kernel/git/jejb/aic94xx-sas-2.6.git (it seems to be at 2.6.16-rc5) linux/kernel/git/torvalds/linux-2.6.git (it probably does have a tag at v2.6.17.4)

Is there a way to merge these to produce 2.6.17.4 (latest released), patched?

Thanks, Peter

ps: ...apart from asking the subtree's maintainer to update his tree...
Alex Riesen· Jul 10, 2006, 12:31 UTC · re: Peter Gervai · lore

Re: newbie'ish FAQ/question about merging different trees

On 7/10/06, Peter Gervai <grin@grin.hu> wrote:
Show 5 quoted lines
> There are two trees on kernel.org's git:
>
> linux/kernel/git/jejb/aic94xx-sas-2.6.git  (it seems to be at 2.6.16-rc5)
> linux/kernel/git/torvalds/linux-2.6.git (it probably does have a tag
> at v2.6.17.4)

It doesn't. The stable tags are in stable per-release repo (linux-2.6.17.y.git currently)

> Is there a way to merge these to produce 2.6.17.4 (latest released), patched?
>
Why, doesn't "git pull aic94xx-sas-2.6.git master" work anymore?
Peter Gervai· Jul 10, 2006, 13:10 UTC · re: Alex Riesen · lore

Re: newbie'ish FAQ/question about merging different trees

On 7/10/06, Alex Riesen <raa.lkml@gmail.com> wrote:
Show 9 quoted lines
> On 7/10/06, Peter Gervai <grin@grin.hu> wrote:
> > There are two trees on kernel.org's git:
> >
> > linux/kernel/git/jejb/aic94xx-sas-2.6.git  (it seems to be at 2.6.16-rc5)
> > linux/kernel/git/torvalds/linux-2.6.git (it probably does have a tag
> > at v2.6.17.4)
>
> It doesn't. The stable tags are in stable per-release repo
> (linux-2.6.17.y.git currently)
Well, even that would do.
> > Is there a way to merge these to produce 2.6.17.4 (latest released), patched?
>
> Why, doesn't "git pull aic94xx-sas-2.6.git master" work anymore?

s/Why,/The answer /; s/ anymore/s for you, right?/;

:)

Thanks, it merged. It does not compile, but that's what I get using git trees. :)

← back to recent threads