From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 10 Jul 2006 12:31:21 GMT
Subject: Re: newbie'ish FAQ/question about merging different trees
Message-ID: <81b0412b0607100531k6fc6921do1990850aef259dba@mail.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?