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

Re: [Q] merging from one (kernel) stable to another?

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Mar 30, 2009, 10:38 UTC
Message-ID
<49D0A133.80503@viscovery.net>
In-Reply-To
<49D09207.9080407@op5.se>
Andreas Ericsson schrieb:
> A possibly better approach for you is to "git format-patch"
> your own changes and apply them to a clean 2.6.26.8 tree
> instead of trying to merge 2.6.26.8 into 2.6.21.

After you have successfully done *that*, you know how the resulting tree must look like, and you give it a tag, say "like-this". If you really want to have a merge, then you can just repeat the merge with your original branch, at which time you will get tons of conflicts. Now you just 'git checkout like-this -- .' and you have all your conflicts resolved in the way you need them.

-- Hannes
Previous: Andreas EricssonNext: Brian Foster
Message 3 of 14 in “[Q] merging from one (kernel) stable to another?”
  1. Brian FosterMar 30, 2009
  2. Andreas EricssonMar 30, 2009
  3. Johannes SixtMar 30, 2009
  4. Brian FosterMar 30, 2009
  5. Johannes SixtMar 30, 2009
  6. Brian FosterMar 30, 2009
  7. Andreas EricssonMar 30, 2009
  8. Brian FosterMar 30, 2009
  9. Andreas EricssonMar 30, 2009
  10. Ping YinMar 30, 2009
  11. Kris ShannonMar 31, 2009
  12. Daniel BarkalowMar 30, 2009
  13. Brian FosterMar 31, 2009
  14. Uwe Kleine-KönigMar 30, 2009

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.