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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 7/10/06, Alex Riesen <raa.lkml@xxxxxxxxx> wrote:
On 7/10/06, Peter Gervai <grin@xxxxxxx> 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. :)
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]