From 519389859e5321c9301cae52ac8918b6a51c20a3 Mon Sep 17 00:00:00 2001
From: Marc Bonnici <marc.bonnici@arm.com>
Date: Fri, 31 Mar 2017 17:37:48 +0100
Subject: [PATCH] Misc Utils: Fixed 'merge_dicts_simple'

Previously this function was ignoring the `other` parameter
and therefore not actually merging the two dictionaries.
---
 wa/utils/misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wa/utils/misc.py b/wa/utils/misc.py
index bb81a0d6..9d2379c1 100644
--- a/wa/utils/misc.py
+++ b/wa/utils/misc.py
@@ -575,7 +575,7 @@ def merge_maps(m1, m2):
 
 def merge_dicts_simple(base, other):
     result = base.copy()
-    for key, value in (base or {}).iteritems():
+    for key, value in (other or {}).iteritems():
         result[key] = merge_config_values(result.get(key), value)
     return result