On Tue, Nov 7, 2017 at 6:35 PM, Michel Dänzer <mic...@daenzer.net> wrote: > On 07/11/17 06:28 PM, Marek Olšák wrote: >> Hi, >> >> This patch is too large for the mailing list: >> >> https://cgit.freedesktop.org/~mareko/mesa/commit/?h=addrlib&id=0e0f044268d3c1af2e78f161aaa2d92c30167cc1 > > From the commit log: > >> I just overwrote all Mesa files with internal addrlib and discarded >> hunks that we should probably keep, but I might have missed something. > > FWIW, if a separate branch was used for importing addrlib changes, Git > could keep track of our changes to it in the Mesa tree.
Previous addrlib updates were like that. I chose a range of addrlib commits, then "git mv address src/amd/addrlib" before the first commit, apply all commits, and cherry-pick them to Mesa. But this time it was too ugly. Marek _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
