From: Sasha Levin Date: Mon, 10 Feb 2020 03:25:53 +0000 (-0500) Subject: fixes for 5.5 X-Git-Tag: v4.19.103~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94ca2069ec62e0d54e62895cb4c52f387060a58c;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 5.5 Signed-off-by: Sasha Levin --- diff --git a/queue-5.5/regulator-fix-for-regulator-core-add-regulator_is_eq.patch b/queue-5.5/regulator-fix-for-regulator-core-add-regulator_is_eq.patch new file mode 100644 index 00000000000..ac14dd5df6c --- /dev/null +++ b/queue-5.5/regulator-fix-for-regulator-core-add-regulator_is_eq.patch @@ -0,0 +1,34 @@ +From 89ec2a184fd968f0581b5850fca16d4798a1cf93 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 15 Jan 2020 12:02:58 +1100 +Subject: regulator fix for "regulator: core: Add regulator_is_equal() helper" + +From: Stephen Rothwell + +[ Upstream commit 0468e667a5bead9c1b7ded92861b5a98d8d78745 ] + +Signed-off-by: Stephen Rothwell +Link: https://lore.kernel.org/r/20200115120258.0e535fcb@canb.auug.org.au +Acked-by: Marek Vasut +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + 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.5/series b/queue-5.5/series index 0750e365273..b37a7f5bb2e 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -363,3 +363,4 @@ crypto-atmel-aes-tdes-do-not-save-iv-for-ecb-mode.patch crypto-atmel-aes-fix-saving-of-iv-for-ctr-mode.patch crypto-atmel-aes-fix-ctr-counter-overflow-when-multi.patch crypto-atmel-tdes-map-driver-data-flags-to-mode-regi.patch +regulator-fix-for-regulator-core-add-regulator_is_eq.patch