{"thread":{"id":"4830","subject":"newbie'ish FAQ/question about merging different trees","startedAt":"2006-07-10T11:56:56Z","lastAt":"2006-07-10T13:10:13Z","messageCount":3,"participants":["Peter Gervai","Alex Riesen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"23540","messageId":"d55656c10607100456o761bb342p3db229b499579dd9@mail.gmail.com","threadId":"4830","inReplyTo":null,"subject":"newbie'ish FAQ/question about merging different trees","fromName":"Peter Gervai","fromEmail":"grin@grin.hu","sentAt":"2006-07-10T11:56:56Z","receivedAt":"2006-07-10T11:56:56Z","isPatch":false,"sender":{"key":"grin@grin.hu","avatar":null},"body":"Hello,\n\nI ask with specifics to make it easier to get, but the question\nprobably general.\n\nIn one sentence: I would like to use\nlinux/kernel/git/jejb/aic94xx-sas-2.6.git with the current released\nkernel, which is 2.6.17.4 at the moment.\n\n\nIn more sentences:\nThere are two trees on kernel.org's git:\n\nlinux/kernel/git/jejb/aic94xx-sas-2.6.git  (it seems to be at 2.6.16-rc5)\nlinux/kernel/git/torvalds/linux-2.6.git (it probably does have a tag\nat v2.6.17.4)\n\nIs there a way to merge these to produce 2.6.17.4 (latest released), patched?\n\nThanks,\nPeter\n\nps: ...apart from asking the subtree's maintainer to update his tree...\n"},{"id":"23543","messageId":"81b0412b0607100531k6fc6921do1990850aef259dba@mail.gmail.com","threadId":"4830","inReplyTo":"d55656c10607100456o761bb342p3db229b499579dd9@mail.gmail.com","subject":"Re: newbie'ish FAQ/question about merging different trees","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2006-07-10T12:31:21Z","receivedAt":"2006-07-10T12:31:21Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 7/10/06, Peter Gervai <grin@grin.hu> wrote:\n> There are two trees on kernel.org's git:\n>\n> linux/kernel/git/jejb/aic94xx-sas-2.6.git  (it seems to be at 2.6.16-rc5)\n> linux/kernel/git/torvalds/linux-2.6.git (it probably does have a tag\n> at v2.6.17.4)\n\nIt doesn't. The stable tags are in stable per-release repo\n(linux-2.6.17.y.git currently)\n\n> Is there a way to merge these to produce 2.6.17.4 (latest released), patched?\n>\n\nWhy, doesn't \"git pull aic94xx-sas-2.6.git master\" work anymore?\n"},{"id":"23546","messageId":"d55656c10607100610q1f3b63fcjb706f122d1a502de@mail.gmail.com","threadId":"4830","inReplyTo":"81b0412b0607100531k6fc6921do1990850aef259dba@mail.gmail.com","subject":"Re: newbie'ish FAQ/question about merging different trees","fromName":"Peter Gervai","fromEmail":"grin@grin.hu","sentAt":"2006-07-10T13:10:13Z","receivedAt":"2006-07-10T13:10:13Z","isPatch":false,"sender":{"key":"grin@grin.hu","avatar":null},"body":"On 7/10/06, Alex Riesen <raa.lkml@gmail.com> wrote:\n> On 7/10/06, Peter Gervai <grin@grin.hu> wrote:\n> > There are two trees on kernel.org's git:\n> >\n> > linux/kernel/git/jejb/aic94xx-sas-2.6.git  (it seems to be at 2.6.16-rc5)\n> > linux/kernel/git/torvalds/linux-2.6.git (it probably does have a tag\n> > at v2.6.17.4)\n>\n> It doesn't. The stable tags are in stable per-release repo\n> (linux-2.6.17.y.git currently)\n\nWell, even that would do.\n\n> > Is there a way to merge these to produce 2.6.17.4 (latest released), patched?\n>\n> Why, doesn't \"git pull aic94xx-sas-2.6.git master\" work anymore?\n\ns/Why,/The answer /;\ns/ anymore/s for you, right?/;\n\n:)\n\nThanks, it merged. It does not compile, but that's what I get using\ngit trees. :)\n"}]}