On 10/31/2014, 07:37 PM, Johannes Weiner wrote: > On Fri, Oct 31, 2014 at 11:43:01AM +0100, Jiri Slaby wrote: >> On 10/08/2014, 03:26 PM, Johannes Weiner wrote: >>> From 1eedd7e702d68d9cb364ca32264dce26f675969b Mon Sep 17 00:00:00 2001 >>> From: Johannes Weiner <hannes@xxxxxxxxxxx> >>> Date: Thu, 2 Oct 2014 00:00:41 +0000 >>> Subject: [patch] mm: page_alloc: fix zone allocation fairness on UP >>> >>> commit abe5f972912d086c080be4bde67750630b6fb38b upstream. ... >> Hi, this does not apply to 3.12. It looks like this in there: >> if (alloc_flags & ALLOC_FAIR) { >> if (!zone_local(preferred_zone, zone)) >> break; >> if (zone_is_fair_depleted(zone)) { > > Mel's missing patches were the original source of conflict why this > backport didn't apply to 3.12. Now that they went in, my modified > backport no longer applies, but the original patch does again :-) > > You can just cherry-pick abe5f972912d086c080be4bde67750630b6fb38b > without any conflicts now: Cool! Now applied to 3.12. Thanks. -- js suse labs -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html