merge origin

17 files changed, 18 insertions, 130 deletions

diff --git a/configs/fedora/generic/CONFIG_DVB_MAX_ADAPTERS b/configs/fedora/generic/CONFIG_DVB_MAX_ADAPTERS
index 01b45579f..2d31b409b 100644
--- a/configs/fedora/generic/CONFIG_DVB_MAX_ADAPTERS
+++ b/configs/fedora/generic/CONFIG_DVB_MAX_ADAPTERS
@@ -1 +1 @@
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
diff --git a/hwmon-rpi-Fix-initial-notify.patch b/hwmon-rpi-Fix-initial-notify.patch
deleted file mode 100644
index eb6ad7c78..000000000
--- a/hwmon-rpi-Fix-initial-notify.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From patchwork Sun Nov 11 12:01:11 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-X-Patchwork-Submitter: Stefan Wahren <stefan.wahren@i2se.com>
-X-Patchwork-Id: 10677591
-Return-Path: <linux-hwmon-owner@kernel.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
-	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1554014DB
-	for <patchwork-linux-hwmon@patchwork.kernel.org>;
- Sun, 11 Nov 2018 12:02:21 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
-	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF81F2AAE1
-	for <patchwork-linux-hwmon@patchwork.kernel.org>;
- Sun, 11 Nov 2018 12:02:20 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
-	id DD04A2AAF4; Sun, 11 Nov 2018 12:02:20 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
-	pdx-wl-mail.web.codeaurora.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI,
-	RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
-	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F86D2AAE1
-	for <patchwork-linux-hwmon@patchwork.kernel.org>;
- Sun, 11 Nov 2018 12:02:20 +0000 (UTC)
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-        id S1727510AbeKKVum (ORCPT
-        <rfc822;patchwork-linux-hwmon@patchwork.kernel.org>);
-        Sun, 11 Nov 2018 16:50:42 -0500
-Received: from mout.kundenserver.de ([212.227.17.13]:56911 "EHLO
-        mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-        with ESMTP id S1727492AbeKKVum (ORCPT
-        <rfc822;linux-hwmon@vger.kernel.org>);
-        Sun, 11 Nov 2018 16:50:42 -0500
-Received: from localhost.localdomain ([37.4.249.153]) by
- mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis)
- id 1N5W0q-1fPBCS2EFm-016xot; Sun, 11 Nov 2018 13:01:38 +0100
-From: Stefan Wahren <stefan.wahren@i2se.com>
-To: Eric Anholt <eric@anholt.net>,
-        Florian Fainelli <f.fainelli@gmail.com>,
-        Jean Delvare <jdelvare@suse.com>,
-        Guenter Roeck <linux@roeck-us.net>,
-        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: linux-rpi-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org,
-        linux-kernel@vger.kernel.org,
-        Stefan Wahren <stefan.wahren@i2se.com>
-Subject: [PATCH] hwmon: rpi: Fix initial notify
-Date: Sun, 11 Nov 2018 13:01:11 +0100
-Message-Id: <1541937671-26385-1-git-send-email-stefan.wahren@i2se.com>
-X-Mailer: git-send-email 2.7.4
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-X-Provags-ID: V03:K1:HEVIdEl0kizgBdNf0M5wstvyz7s6HdToU1mddQPsbGgHjkiBWSZ
- SKazwNvgO6cbViYoUW17vGwM+wtH3UvfMleX6l3XXOJUwGoJIZP7C9iMFyqzOhl1AlaWRQ+
- nGjpMnsO6ZoiSjYhxMPB911ALciozsvmmLqnauqOofp2A/Y1/Tcfzfrv2IhQJICMhDSNaco
- akAN1etmFdi29Cdupykhw==
-X-UI-Out-Filterresults: notjunk:1;V01:K0:tzezqudV+18=:I+avf+CPQCA+RPEHvwv55R
- iJN07WrrHGCkxDyTa1k+J8anYCg6oDlByPsB4O51GNXOi1XH2wPejZd6QJflDwV0IjWsd1mfU
- xmQwbUh5YsPt6czgCadtNhv89tCiiHGxGyLiNjZpXICCRYxcY9szc+T27wAi6tAeQsahSk7Zc
- P7+RqK/K3qtckuZiInGDWLzDvbMkItVWmxB/86m6NH4QbXCqJo/m0F6yZWCq1t/ocW/NmK9nH
- 3sFSBLGNA+DGHqRLq1Tp+a+Xf1XuQlWwVYusgY3z9tNBdbTG9fQhBwac+oBJ+ZnF8S5WtdcSk
- T31iv44dd2DkPTXqRuzSBWKnMQIZbabtWOYI9paJgywle7kdbJJlWx/kHONkEeKdjM7+MCUVn
- 9iAWGJiu9tZ+i+FxYqUlLGOlZZW/sJiXzizD+WQYXdDiNh9lU2926j9Ydc+vF5fF1DzwaLsTf
- 7cvqwTu8gBFVOffZhsHT5+loV6D5WvJjY3JUPmhraz4ioeagBG6+s34gN3LtPYnUYNJO/Cd3Z
- CLnkDRAoKUNCeqhqsifSzcy49XV5h8YPrkSBWWBek7gAzU/DVI1mXLgcESMoe77NdlLeCqLUm
- 0W+phul1X1/9/WPqPkr6j9E7MjgIbo7XcPtmy+treFmpnZWz5766NVHRJ+RPCN9RVFocCcILy
- +n2ryGG9Llo5cGCbUU+eSWsigfVGTGmQzvatSRpt262UKg3EyZrqtedY+GLnKMMvAqra/GKvs
- 0SObqg+2lnFLxgOSq/dM7hz7QuKk2JFmfuuXu0T+aMTpc9ZZx90sE6kMjBz8cF+hBFutqehUk
- 10cHzngQFaS21pN/PQ2gpU1ZlGFfqQ3gEjQz8zF7KGhTS5FiYY=
-Sender: linux-hwmon-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-hwmon.vger.kernel.org>
-X-Mailing-List: linux-hwmon@vger.kernel.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-In case an under-voltage happens before probing the driver wont
-write the critical warning into the kernel log. So don't init
-of last_throttled during probe and fix this issue.
-
-Fixes: 74d1e007915f ("hwmon: Add support for RPi voltage sensor")
-Reported-by: "Noralf Trønnes" <noralf@tronnes.org>
-Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
----
- drivers/hwmon/raspberrypi-hwmon.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c
-index be5ba46..0d04572 100644
---- a/drivers/hwmon/raspberrypi-hwmon.c
-+++ b/drivers/hwmon/raspberrypi-hwmon.c
-@@ -115,7 +115,6 @@ static int rpi_hwmon_probe(struct platform_device *pdev)
- {
- 	struct device *dev = &pdev->dev;
- 	struct rpi_hwmon_data *data;
--	int ret;
- 
- 	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
- 	if (!data)
-@@ -124,11 +123,6 @@ static int rpi_hwmon_probe(struct platform_device *pdev)
- 	/* Parent driver assure that firmware is correct */
- 	data->fw = dev_get_drvdata(dev->parent);
- 
--	/* Init throttled */
--	ret = rpi_firmware_property(data->fw, RPI_FIRMWARE_GET_THROTTLED,
--				    &data->last_throttled,
--				    sizeof(data->last_throttled));
--
- 	data->hwmon_dev = devm_hwmon_device_register_with_info(dev, "rpi_volt",
- 							       data,
- 							       &rpi_chip_info,
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index bf5b656a8..23772d09d 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1559,7 +1559,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index c41686e7c..567915d11 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1549,7 +1549,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 16800238d..e6bf6f531 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1654,7 +1654,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index b46c6e4f9..ab0414af8 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1564,7 +1564,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 5ff88b664..bda4737f7 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1554,7 +1554,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 0d92d2c3a..382662436 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1644,7 +1644,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index db6940029..817209ac6 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1367,7 +1367,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-i686.config b/kernel-i686.config
index ba18befe7..6bf7093fe 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1354,7 +1354,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 552308e96..2ce22ad07 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1271,7 +1271,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 6d362bdcc..bfebf587f 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1258,7 +1258,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a6df9395a..21f201d19 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1270,7 +1270,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index add5826dd..08c84a193 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1257,7 +1257,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 1da34e08f..ced1cdc8a 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1413,7 +1413,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 63d45f36f..5a0df6f10 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1400,7 +1400,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_FIREDTV=m
 CONFIG_DVB_HOPPER=m
 CONFIG_DVB_MANTIS=m
-CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_MAX_ADAPTERS=16
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_MN88472=m
 CONFIG_DVB_MN88473=m
diff --git a/kernel.spec b/kernel.spec
index c2b598d29..8d49f1790 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -612,9 +612,6 @@ Patch331: bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
 # https://patchwork.kernel.org/patch/10686407/
 Patch332: raspberrypi-Fix-firmware-calls-with-large-buffers.patch
 
-# https://patchwork.kernel.org/patch/10677591/
-Patch333: hwmon-rpi-Fix-initial-notify.patch
-
 # From 4.20, fix eth link/act lights on 3B+
 Patch334: bcm2837-fix-eth-leds.patch
 
@@ -1919,6 +1916,9 @@ fi
 #
 #
 %changelog
+* Mon Dec 17 2018 Jeremy Cline <jcline@redhat.com> - 4.19.10-300
+- Linux v4.19.10
+
 * Fri Dec 14 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.19.9-301
 - Fix Raspberry Pi issues affecting WiFi (rhbz 1652093)