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

Forward-port a patch using git

From
SSpelic <spelic@shiftmail.org>
Date
Dec 1, 2010, 15:37 UTC
Message-ID
<4CF66BAA.1010203@shiftmail.org>

Hi all I have patches (xyz.patch files) which apply cleanly to kernel 2.6.36 and 2.6.36.1 and do not apply cleanly on 2.6.37-rc4 (I mean they do apply but with massive offsets...) I would like to forward-port them to 2.6.37-rc4, i.e. create equivalent patch files that would apply cleanly on 2.6.37-rc4 with zero offsets.

I have thought that there should be some git mechanism to confirm that such massive offsets which "patch" sees are actually correct and not false-positives, and are caused by the commits from 2.6.36 to 2.6.37-rc4. There should be some mechanism in git to track line shifts in source files caused by commits... After confirming this, Git should create for me equivalent patch files that apply cleanly to 2.6.37-rc4 that I can give to other people.

Is it possible? I am unfortunately a newbie with git. Can you help me?
Thank you
PS: I have downloaded the linux-2.6-stable git repository containing all 
needed revisions: v2.6.36, v2.6.36.1 and v2.6.37 .
Next: Spelic
Message 1 of 3 in “Forward-port a patch using git”
  1. SpelicDec 1, 2010
  2. SpelicDec 1, 2010
  3. Jeff KingDec 1, 2010

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.