From: Peter Gervai <grin@grin.hu>
Date: Mon, 10 Jul 2006 11:56:56 GMT
Subject: newbie'ish FAQ/question about merging different trees
Message-ID: <d55656c10607100456o761bb342p3db229b499579dd9@mail.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...