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

newbie'ish FAQ/question about merging different trees

From
PGPeter Gervai <grin@grin.hu>
Date
Jul 10, 2006, 11:56 UTC
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...
Next: Alex Riesen
Message 1 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.