summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-08-16 09:26:45 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-08-16 09:26:45 -0400
commit24a429b4e91aabc5499d75eb46dc46ed71f0a497 (patch)
tree77a53bf2a4e18204289e2ac4806221234ae1dffd
parent593ea10443dd3789b485e970ad08b9c0ddd2b089 (diff)
downloadkernel-24a429b4e91aabc5499d75eb46dc46ed71f0a497.tar.gz
kernel-24a429b4e91aabc5499d75eb46dc46ed71f0a497.tar.xz
kernel-24a429b4e91aabc5499d75eb46dc46ed71f0a497.zip
Linux v3.16-11452-g88ec63d6f85c
-rw-r--r--kernel.spec7
-rw-r--r--nouveau_platform-fix.patch13
-rw-r--r--sources1
3 files changed, 5 insertions, 16 deletions
diff --git a/kernel.spec b/kernel.spec
index 17c8aedd0..b95dc15b2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 6
+%define gitrev 7
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -637,7 +637,6 @@ Patch26013: acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
Patch27000: tegra-powergate-header-move.patch
-Patch27001: nouveau_platform-fix.patch
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1362,7 +1361,6 @@ ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
ApplyPatch 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
ApplyPatch tegra-powergate-header-move.patch
-ApplyPatch nouveau_platform-fix.patch
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
@@ -2246,6 +2244,9 @@ fi
# ||----w |
# || ||
%changelog
+* Sat Aug 16 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git7.1
+- Linux v3.16-11452-g88ec63d6f85c
+
* Fri Aug 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git6.1
- Linux v3.16-11383-gc9d26423e56c
diff --git a/nouveau_platform-fix.patch b/nouveau_platform-fix.patch
deleted file mode 100644
index 85256f077..000000000
--- a/nouveau_platform-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/gpu/drm/nouveau/nouveau_platform.c b/drivers/gpu/drm/nouveau/nouveau_platform.c
-index 0ffeb50..e53e854 100644
---- a/drivers/gpu/drm/nouveau/nouveau_platform.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_platform.c
-@@ -149,7 +149,7 @@ power_down:
- static int nouveau_platform_remove(struct platform_device *pdev)
- {
- struct drm_device *drm_dev = platform_get_drvdata(pdev);
-- struct nouveau_device *device = nouveau_dev(drm_dev);
-+ struct nouveau_device *device = nv_device(&nouveau_drm(drm_dev)->device);
- struct nouveau_platform_gpu *gpu = nv_device_to_platform(device)->gpu;
-
- nouveau_drm_device_remove(drm_dev);
diff --git a/sources b/sources
index c3b49fdf5..989d123d6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
5c569ed649a0c9711879f333e90c5386 linux-3.16.tar.xz
49868ce6467b35cd9ffea1120d129462 perf-man-3.16.tar.gz
3597325f13a9a8915b556fb965e67275 patch-3.16-git6.xz
+f1771cbbb6e80b4fa04c41bb9c75f78b patch-3.16-git7.xz