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

Re: Git setup for kernel in-house development + mainstream submissions?

From
Matt Graham <mdg149@gmail.com>
Date
Feb 3, 2009, 04:13 UTC
Message-ID
<1c5969370902022013l7c0b3619ue1de39c6d8a13563@mail.gmail.com>
In-Reply-To
<49861363.1000104@aster.pl>
On Sun, Feb 1, 2009 at 16:25, PaV <pav@aster.pl> wrote:
Show 13 quoted lines
> I would like to kindly ask for suggestions how to setup and use git in a
> company that performs in-house kernel development (drivers mostly) for
> its own devices and would like to occasionaly submit patches for mainstream.
>
> 4) a simple way to select changes (which may be as small as only parts
> of any of the drivers), format them and submit for upstream merge.
> Preferably, if possible, prepare those series of patches and store them
> for later use (immediate submission might not be possible and might not
> be done at all).
>
> (4) - now this is hard.
> The main problems are how to create, how to diff and how to manage those
> patches (stgit?) and what to do when mainstream gets updated, etc...

When you decide what to prepare for an upstream merge, it sounds like what you'd want to do is make a new "upstream" branch and cherry pick the changes you want onto it. You can use git cherry-pick -n to clean them up or squash them together if necessary.

Previous: Johannes Gilger
Message 3 of 3 in “Git setup for kernel in-house development + mainstream submissions?”
  1. PaVFeb 1, 2009
  2. Johannes GilgerFeb 2, 2009
  3. Matt GrahamFeb 3, 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.