Comment 27 for bug 1442411

Revision history for this message
Michael Boratko (boratko) wrote :

I think perhaps I'm using the wrong vocabulary, which is the cause of confusion.

When I did the git bisect I tested each bisection point manually, so I must have actually tested that commit at some point in the past (otherwise I wouldn't have truly bisected). Checking the bisect log, that commit was tested fifth, and found to be "good" at that time.

The two comments are not contradictory. When I simply use git reset --hard f47f46d7b09cf1d09e4b44b6cc4dd7d68a08028c and compile the wifi works. (This is the last working commit.) When I use git reset --hard ab1304b986468e3ef698ec4e1cb1a3d4ba080811 and compile, the wifi does not work.

Finally, when I use git reset --hard Ubuntu 3.19.0-13.13 and then do git revert ab1304b986468e3ef698ec4e1cb1a3d4ba080811, I get a merge conflict. There is just one file to address, and the changes are pretty straightforward to handle. I clear the merge, commit, and compile, but again the wifi doesn't work.