summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm-generic1
-rw-r--r--config-generic3
-rw-r--r--drm-i915-hush-check-crtc-state.patch4
-rw-r--r--kernel.spec6
-rw-r--r--lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch2
-rw-r--r--sources2
6 files changed, 13 insertions, 5 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 196613adb..624af21e1 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -299,6 +299,7 @@ CONFIG_CMA_AREAS=7
# drm
# CONFIG_DRM_VMWGFX is not set
+# CONFIG_DRM_MSM_DSI is not set
# CONFIG_IMX_IPUV3_CORE is not set
# CONFIG_DEBUG_SET_MODULE_RONX is not set
diff --git a/config-generic b/config-generic
index b32831c8f..5c48d02ac 100644
--- a/config-generic
+++ b/config-generic
@@ -3043,6 +3043,7 @@ CONFIG_DRM_CIRRUS_QEMU=m # do not enable on f17 or older
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_R128 is not set
CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
# CONFIG_DRM_RADEON_UMS is not set
# CONFIG_DRM_I810 is not set
# CONFIG_DRM_MGA is not set
@@ -3068,9 +3069,11 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_QXL=m
CONFIG_DRM_BOCHS=m
CONFIG_DRM_PTN3460=m
+CONFIG_DRM_PS8622=m
# CONFIG_DRM_PANEL is not set
# CONFIG_DRM_PANEL_SIMPLE is not set
# CONFIG_DRM_PANEL_S6E8AA0 is not set
+CONFIG_DRM_VGEM=m
#
# PCMCIA character devices
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index bd927d2f6..56692986e 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -14,10 +14,10 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index f75173c20f47..1003782a38c4 100644
+index d547d9c8dda2..f523ee679987 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10917,7 +10917,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -11308,7 +11308,7 @@ check_crtc_state(struct drm_device *dev)
if (active &&
!intel_pipe_config_compare(dev, crtc->config, &pipe_config)) {
diff --git a/kernel.spec b/kernel.spec
index e8aa6d8b2..e78347500 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 9
+%define gitrev 10
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2193,6 +2193,10 @@ fi
#
#
%changelog
+* Mon Apr 20 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git10.1
+- Linux v4.0-8962-g14aa02449064
+- DRM merge
+
* Mon Apr 20 2015 Dennis Gilmore <dennis@ausil.us>
- enable mvebu for the LPAE kernel
diff --git a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch b/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
index fa1df59ed..ca2e63fdb 100644
--- a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
+++ b/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
@@ -19,7 +19,7 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/Kconfig b/lib/Kconfig
-index f5440221d929..03000e3d1077 100644
+index 601965a948e8..028213cf0e4d 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -390,7 +390,8 @@ config CHECK_SIGNATURE
diff --git a/sources b/sources
index 81ab9b71d..230f43bfa 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
a86916bd12798220da9eb4a1eec3616d linux-4.0.tar.xz
d125eecce68ab6fb5f1f23523c2c04b8 perf-man-4.0.tar.gz
-65de65a37cdcaf4d21aaec6383b8bfcd patch-4.0-git9.xz
+3ffa3a8db217329c81aa42881c6518c7 patch-4.0-git10.xz