diff options
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | hwmon-rpi-Fix-initial-notify.patch | 112 | ||||
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | sources | 1 |
4 files changed, 8 insertions, 118 deletions
@@ -1 +1 @@ -2e6e902d185027f8e3cb8b7305238f7e35d6a436 +121b018f8c74b4e0ba81b4b8ee73a82db3f24b7b 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.spec b/kernel.spec index 1d7f61cb6..d57af3a6a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -586,9 +586,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 - # Patches enabling device specific brcm firmware nvram # https://www.spinics.net/lists/linux-wireless/msg178827.html Patch340: brcmfmac-Remove-firmware-loading-code-duplication.patch @@ -1883,6 +1880,10 @@ fi # # %changelog +* Wed Nov 28 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc4.git1.1 +- Linux v4.20-rc4-35-g121b018f8c74 +- Reenable debugging options. + * Mon Nov 26 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc4.git0.1 - Linux v4.20-rc4 - Disable debugging options. @@ -1,2 +1,3 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 SHA512 (patch-4.20-rc4.xz) = 6cd5063110b286fa61f0d96ca675d5235debe7ac9e21ce2d709bdb299af897448048650e7d5497b9b2de474c42b120f89ed6cc5b5d38f71762263ad5a8ee9999 +SHA512 (patch-4.20-rc4-git1.xz) = 1279689ea4090d75ef7deb5a5b9a10152bded506c655a3746cd8efa30c9431fb26065720153e94911a76e292a8c58be24e8508fa93cda4ccc940eaed7fa41157 |