On Thu, 2016-02-25 at 11:01 +0100, Laszlo Ersek wrote: > > > Anyway, I've rebased my tree on top of yours, > > Thanks -- I'll push the first three patches to edk2 master in a minute, > and I'll post a new version of the fourth.
You've committed the one I need. Thanks. > > split up the patch > > changes into separate bisectable commits, and pushed my tree out again > > to http://git.infradead.org/users/dwmw2/edk2.git > > I skimmed your fresh master -- the way the patch evolves looks > excellent. I guess it took a lot of effort. Actually it wasn't that much effort in the end — I'd already *done* the fun part, which was identifying the various changes which were all mashed together into our EDKII_openssl patch and getting them into suitable shape for upstream. And the "new" patch, which we end up with, is just generated from a series of clean commits in a git tree. I'm not *completely* insane :) So all I really needed to do was git checkout 1.0.2f patch -p0 < EDKII_openssl patch git commit -m rt3992 crypto/x509v3/ext_dat.h git commit -m rt3951 crypto/x509/x509_vfy.[ch] ...etc. In all but one case, it really was that simple because the separate logical changes all touched *different* files. One time I had to use 'git commit --interactive' because two logical changes touched the same file. Then for each logical change, it was just a case of reverting the original version I'd just committed from the EDKII_openssl patch, and applying the backported version of the same change from upstream. And 'git diff 1.0.2f.. > unix2dos > EDKII_openssl.patch at each stage. -- dwmw2
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
