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

Re: Forward-port a patch using git

From
SSpelic <spelic@shiftmail.org>
Date
Dec 1, 2010, 18:11 UTC
Message-ID
<4CF68FCB.2030301@shiftmail.org>
In-Reply-To
<4CF66BAA.1010203@shiftmail.org>
On 12/01/2010 04:37 PM, Spelic wrote:
Show 8 quoted lines
> 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 found it myself, sorry for having asked.
It was:

checkout v2.6.36 apply 1 patch commit apply 1 patch commit ... rebase v2.6.37-rc4 git format-patch -o <destdir> -numpatches

Previous: SpelicNext: Jeff King
Message 2 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.