On 01/26/2016 04:01 PM, Johannes Berg wrote: >>> There's a conflict due to 8f57e4d930d, how should I fix it? > I think we can thus drop my patch - that commit fixes the issue that > Andrew had reported as well, and that I worked around by casting the > result... now that abs() has a consistent result, using s32 in both > sides of the min() is perfectly fine. > > johannes > > I did just that in my new tag: iwlwifi-for-kalle-2016-01-26_2 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html