[openib-general] [PATCH] for OFED 1.2

[Sasha Khapyorsky]

On 19:44 Tue 27 Feb     , Michael S. Tsirkin wrote:
> > Quoting Sean Hefty <sean.hefty at intel.com>:
> > Subject: Re: [PATCH] for OFED 1.2
> > 
> > >I think with stacked git or just git and rebasing at key times, you
> > >could keep an ofed_1_2 tree that folks can easily apply patches to...
> > >
> > >Its too late to change this for 1.2, but you might want to reconsider
> > >the design for 1.3.
> > 
> > Can't we just create a new branch (ofed_1_2_patched) with these patches already
> > applied and in the correct order?  
> 
> Then what we do when we want to update to new upstream? Throw this branch away?
> As it is, I just pull then build and remove patches that conflict.

You can save this branch as <branch-name>-<upstream-name> (or better)
and to rebase <branch-name> to the new upstream.

> By the way, there are backport patches, etc - it is still incorrect
> to say that you would be able to generate a patch out of git
> and know it's a good one without test-build.

In similar way you can track backport patch sets as branches.

> > Maybe I'm just not understanding the work flow here...
> 
> Sean, please install quilt and try using it for working with the system.
> Adding new patch is usually done in this way
> quilt new <patch>
> quilt add <files>
> edit
> quilt refresh
> 
> cp patches/<patch> kernel_patches/fixes/
> git add kernel_patches/fixes/<patch>
> git commit kernel_patches/fixes/<patch>

This looks strange for me to track patches against patches...

Sasha