On 04/07/2014 08:47 PM, Jeff King wrote: > On Mon, Apr 07, 2014 at 01:33:44AM +0200, Michael Haggerty wrote: > >> This function is used for other things besides the index, so rename it >> accordingly. > > Oh, and here it is. I should really have just read ahead before > responding to patch 1. > > We can either re-order these first two, or just not worry about it.
Thanks for catching this. Yes, swapping the first two patches solves the problem and doesn't conflict. Michael -- Michael Haggerty mhag...@alum.mit.edu http://softwareswirl.blogspot.com/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html