git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
PGPeter Gervai <grin@grin.hu>
Date
Jul 10, 2006, 13:10 UTC
Message-ID
<d55656c10607100610q1f3b63fcjb706f122d1a502de@mail.gmail.com>
In-Reply-To
<81b0412b0607100531k6fc6921do1990850aef259dba@mail.gmail.com>
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. :)

Previous: Alex Riesen
Message 3 of 3 in “newbie'ish FAQ/question about merging different trees”
  1. Peter GervaiJul 10, 2006
  2. Alex RiesenJul 10, 2006
  3. Peter GervaiJul 10, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.