[openib-general] [PATCH] for OFED 1.2
Michael S. Tsirkin
mst at mellanox.co.il
Tue Feb 27 10:14:08 PST 2007
> Quoting Steve Wise <swise at opengridcomputing.com>:
> Subject: Re: [PATCH] for OFED 1.2
>
> On Tue, 2007-02-27 at 19:44 +0200, 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.
> >
> > 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.
> >
> > > 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>
>
> NOTE: The key to the above process is the assumption that the developer
> maintains _all_ of the existing patches from kernel_patches/ on top of
> the ofed_1_2 tree using quilt or stg. Otherwise quilt/stg isn't buying
> you anything.
OFED will do this automatically.
> And this doesn't take into account backports.
The process works with backport patches too: you just have to do this
> quilt pop -a
>
> > > quilt new <patch>
> > > quilt add <files>
> > > edit
> > > quilt refresh
>
> quilt push -a
--
MST
More information about the general
mailing list