Re: Creating diff from 2.6.16 from cryptodev-2.6 git tree

From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Jun 30, 2006, 01:36 UTC
Message-ID: <20060630013627.GA27527@gondor.apana.org.au>
In-Reply-To: <44A47BE0.9060504@logix.cz>

On Fri, Jun 30, 2006 at 01:18:24PM +1200, Michal Ludvig wrote:

Show 6 quoted lines

> 
> just a quick question: how can I create a patch with all changes in
> cryptodev-2.6 tree against tag v2.6.16 in Linus tree? I've got
> git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
> cloned here and want to extract all your commits in this tree since
> 2.6.16. Is there a way to do it in Git/Cogito?

OK, it's easier if you break this into three problems.

You start by getting all the changes merged right after 2.6.16. This can be done by locating the merge changeset in Linus's tree. It looks like this:

commit ec1248e70edc5cf7b485efcc7b41e44e10f422e5
Merge: 3d1f337b3e7378923c89f37afb573a918ef40be5 55e9dce37ddf3ab358ba1d1e9eef4ee4bd8174a6
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date:   Tue Mar 21 09:33:19 2006 -0800

    Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

    * master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      [CRYPTO] aes: Fixed array boundary violation
      [CRYPTO] tcrypt: Fix key alignment
      [CRYPTO] all: Add missing cra_alignmask
      [CRYPTO] all: Use kzalloc where possible
      [CRYPTO] api: Align tfm context as wide as possible
      [CRYPTO] twofish: Use rol32/ror32 where appropriate

You can get the diff for this merge by doing

$ git-diff-tree -p 3d1f337b3e7378923c89f37afb573a918ef40be5 ec1248e70edc5cf7b485efcc7b41e44e10f422e5

You then repeat this for 2.6.17 where the merge changeset is:

commit 972d19e837833b93466c6f6a8ef2a7d653000aa3
Merge: cdf4f383a4b0ffbf458f65380ecffbeee1f79841 b9d0a25a484a90c1d60b974d115eff2fe580ce16
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date:   Mon Jun 26 11:03:29 2006 -0700

Finally you get the changes since that merge by find the common changeset between cryptodev-2.6 and Linus's tree and getting all the changes after that.

This method works because all crypto changes since 2.6.16 were merged from my tree. If this wasn't the case, then you'd have to search through the history since 2.6.16 to identify the crypto patches that were merged from other sources.

Cheers,

-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt