Re: TOI patch generation...

Woody Suwalski <[email protected]> Wed, 18 Jul 2012 08:20:24 -0400
Newsgroups gmane.linux.swsusp.devel
Message-ID <[email protected]>
Nix wrote:
> On 18 Jul 2012, Woody Suwalski spake thusly:
>
>> How to produce a patch from toi-head?
>>
>> I have tried going by diff'ing labels:
>> git diff v3.5-rc5 latest
> That should be
>
> git diff v3.5-rc5..HEAD
>
> (assuming you're currently on the toi head)
>
> or simply
>
> git diff v3.5-rc5..
>
>> None have produced a TOI patch which could be applied to current kernels...
> Well, that'll only be applicable to current kernels if you're using
> v3.5-rc5 exactly. You probably want to name the branch your upstream
> kernel is on, e.g.
>
> git diff v3.5-linus..
>
> (but of course this depends entirely on your local branch names).
>
Thanks, "git diff v3.5-rc5..HEAD" seems to work OK for 3.5-rc5

As expected - there is a drawback: it is now very 3.5-rc5 specific, and covers more than just TOI changes - I think it includes kernel later changes as well.

As such it would not apply cleanly to -rc7

Ideally I would like a way to find a way to get a patch of TOI head part against head kernel - or conversely toi-3.5-rc5 against vanilla-3.5-rc5.

I already have git trees of linus-head, a tree of toi-head. How to tie them together?
Any hints? 8-)

Thanks, Woody