Merge git://git.denx.de/u-boot-dm
diff --git a/dts/Kconfig b/dts/Kconfig
index fb2d79e..d639be9 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -61,7 +61,9 @@
config OF_SPL_REMOVE_PROPS
string "List of device tree properties to drop for SPL"
depends on SPL_OF_CONTROL
+ default "interrupt-parent" if SPL_PINCTRL_FULL && SPL_CLK
default "clocks clock-names interrupt-parent" if SPL_PINCTRL_FULL
+ default "pinctrl-0 pinctrl-names interrupt-parent" if SPL_CLK
default "pinctrl-0 pinctrl-names clocks clock-names interrupt-parent"
help
Since SPL normally runs in a reduced memory space, the device tree
diff --git a/tools/patman/series.py b/tools/patman/series.py
index 3399f2c..cc6f80b 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -69,7 +69,10 @@
# Otherwise just set the value
elif name in valid_series:
- self[name] = value
+ if name=="notes":
+ self[name] = [value]
+ else:
+ self[name] = value
else:
raise ValueError("In %s: line '%s': Unknown 'Series-%s': valid "
"options are %s" % (commit.hash, line, name,