On Wed, Feb 8, 2017 at 11:28 PM, Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx> wrote: > On Thu, Feb 09, 2017 at 06:13:46AM +0800, Christopher Li wrote: >> I see. So what happen is that the git am rejects it while >> the patch program has not problem apply the patch. So I take >> the patched version, which was wrong in terms of conflict resolution. >> >> I go through my logs, similar things happen in the following two commit. >> >> 684710647 testsuite: check patterns presence or absence in output >> 49118f27e2 testsuite: check the nbr of times a pattern should be present >> >> "git am" initial rejects it but the patch program accepts it. >> >> Can you double check this two changes sounds correct to you? >> I did take a second look, seems normal to me. > > I just checked, two chunks of the second of these patches are in > another place than what I have here in my original tree but > it's equivalent regarding functionality. Sigh. I was a bit short on time when checking this and the diff I looked at was somehow misleading but in fact the functionality is not at all equivalent although all the tests did the expected result. I'm resending a respin of the two concerned series. Luc -- To unsubscribe from this list: send the line "unsubscribe linux-sparse" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
