fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/regulator-fix-for-regulator-core-add-regulator_is_eq.patch b/queue-5.4/regulator-fix-for-regulator-core-add-regulator_is_eq.patch
new file mode 100644 (file)
index 0000000..3675585
--- /dev/null
+++ b/queue-5.4/regulator-fix-for-regulator-core-add-regulator_is_eq.patch
@@ -0,0 +1,34 @@
+From 2353e146cee9a02b350784c967ab1cadd2a81cde Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 15 Jan 2020 12:02:58 +1100
+Subject: regulator fix for "regulator: core: Add regulator_is_equal() helper"
+
+From: Stephen Rothwell <sfr@canb.auug.org.au>
+
+[ Upstream commit 0468e667a5bead9c1b7ded92861b5a98d8d78745 ]
+
+Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
+Link: https://lore.kernel.org/r/20200115120258.0e535fcb@canb.auug.org.au
+Acked-by: Marek Vasut <marex@denx.de>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ include/linux/regulator/consumer.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
+index 2c89d886595cb..6a92fd3105a31 100644
+--- a/include/linux/regulator/consumer.h
++++ b/include/linux/regulator/consumer.h
+@@ -596,7 +596,7 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
+ }
+ 
+ static inline bool
+-regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
++regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
+ {
+       return false;
+ }
+-- 
+2.20.1
+

diff --git a/queue-5.4/series b/queue-5.4/series
index 4564c446ee01a7c5c8c020ff8af16948e2bc12c8..af95776cac9d0a157533490756cf94aaf775c073 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -305,3 +305,4 @@ x86-apic-msi-plug-non-maskable-msi-affinity-race.patch
 clocksource-prevent-double-add_timer_on-for-watchdog_timer.patch
 perf-core-fix-mlock-accounting-in-perf_mmap.patch
 rxrpc-fix-service-call-disconnection.patch
+regulator-fix-for-regulator-core-add-regulator_is_eq.patch