# newbie'ish FAQ/question about merging different trees

3 messages from 2006-07-10 to 2006-07-10. Participants: Peter Gervai, Alex Riesen.
Thread: https://gitlist.dev/t/4830

## Peter Gervai, 2006-07-10 11:56

Subject: newbie'ish FAQ/question about merging different trees
Message-ID: <d55656c10607100456o761bb342p3db229b499579dd9@mail.gmail.com>
URL: https://gitlist.dev/e/d55656c10607100456o761bb342p3db229b499579dd9%40mail.gmail.com

```
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, 2006-07-10 12:31

Subject: Re: newbie'ish FAQ/question about merging different trees
Message-ID: <81b0412b0607100531k6fc6921do1990850aef259dba@mail.gmail.com>
URL: https://gitlist.dev/e/81b0412b0607100531k6fc6921do1990850aef259dba%40mail.gmail.com
In-Reply-To: <d55656c10607100456o761bb342p3db229b499579dd9@mail.gmail.com>

```
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)

> 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, 2006-07-10 13:10

Subject: Re: newbie'ish FAQ/question about merging different trees
Message-ID: <d55656c10607100610q1f3b63fcjb706f122d1a502de@mail.gmail.com>
URL: https://gitlist.dev/e/d55656c10607100610q1f3b63fcjb706f122d1a502de%40mail.gmail.com
In-Reply-To: <81b0412b0607100531k6fc6921do1990850aef259dba@mail.gmail.com>

```
On 7/10/06, Alex Riesen <raa.lkml@gmail.com> wrote:
> 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. :)

```