summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2018-09-10 11:35:45 -0400
committerJeremy Cline <jcline@redhat.com>2018-09-10 11:35:45 -0400
commit65921a3ce302f346bb350e713369dc696488dac8 (patch)
tree04af31c87af6dc7c62c9441a871a733176bc6004
parent040628d2d4c4368a847898216618b80f55309485 (diff)
downloadkernel-65921a3ce302f346bb350e713369dc696488dac8.tar.gz
kernel-65921a3ce302f346bb350e713369dc696488dac8.tar.xz
kernel-65921a3ce302f346bb350e713369dc696488dac8.zip
Linux v4.19-rc3
-rw-r--r--bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch30
-rw-r--r--kernel.spec9
-rw-r--r--sources3
3 files changed, 6 insertions, 36 deletions
diff --git a/bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch b/bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch
deleted file mode 100644
index 7812084f1..000000000
--- a/bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a0cf7704b6bc145a9f198a9b2bcf92ccc5d6b6be Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Fri, 20 Jul 2018 12:58:37 +0100
-Subject: [PATCH] hwmon: rpi: add module alias to raspberrypi-hwmon
-
-The raspberrypi-hwmon driver doesn't automatically load, although it does work
-when loaded, by adding the alias it auto loads as expected when built as a
-module. Tested on RPi2/RPi3 on 32 bit kernel and RPi3B+ on aarch64 with
-Fedora 28 and a patched 4.18 RC kernel.
-
-Fixes: q3c493c885cf ("hwmon: Add support for RPi voltage sensor")
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-CC: Stefan Wahren <stefan.wahren@i2se.com>
-CC: Eric Anholt <eric@anholt.net>
----
- drivers/hwmon/raspberrypi-hwmon.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c
-index fb4e4a6bb1f63..be5ba46908953 100644
---- a/drivers/hwmon/raspberrypi-hwmon.c
-+++ b/drivers/hwmon/raspberrypi-hwmon.c
-@@ -164,3 +164,4 @@ module_platform_driver(rpi_hwmon_driver);
- MODULE_AUTHOR("Stefan Wahren <stefan.wahren@i2se.com>");
- MODULE_DESCRIPTION("Raspberry Pi voltage sensor driver");
- MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:raspberrypi-hwmon");
---
-2.17.1
-
diff --git a/kernel.spec b/kernel.spec
index 51e779678..a65c882f4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 2
+%global rcrev 3
# The git snapshot level
-%define gitrev 3
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -584,8 +584,6 @@ Patch311: arm64-ZynqMP-firmware-clock-drivers-core.patch
Patch331: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
-Patch332: bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch
-
# https://patchwork.freedesktop.org/patch/240917/
Patch334: drm-vc4-Fix-the-no-scaling-case-on-multi-planar-YUV-formats.patch
@@ -1863,6 +1861,9 @@ fi
#
#
%changelog
+* Mon Sep 10 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc3.git0.1
+- Linux v4.19-rc3
+
* Mon Sep 10 2018 Jeremy Cline <jcline@redhat.com>
- Disable debugging options.
diff --git a/sources b/sources
index 0def59237..5e4fcfd10 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
-SHA512 (patch-4.19-rc2.xz) = 4b40954908c077525ee849c56d5daddf4aca996b00387e45b91452e5bacde1caedf7ff66169a5f296d6d38b9e4b057de22419b273d3472c182c9677f97843ccf
-SHA512 (patch-4.19-rc2-git3.xz) = c797879ff93a1dd35c7438ff7dae7548fa63df918e65fb196d9916ae94d903d4c78dcfe317b3de5be2e7b2f15e3deb5090e6fa5f38ec2ff4100e987d995d2ea6
+SHA512 (patch-4.19-rc3.xz) = 4165e2ae2efddad320d54eacaa26fec93e57d48960c031618105a07b7242b6347cdfb3bea5cee7907465ff110c41d0d1ce837095f37d21921bb6a1d703f6c875