diff options
| -rw-r--r-- | config-arm-generic | 4 | ||||
| -rw-r--r-- | config-generic | 3 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 6 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 13 insertions, 4 deletions
diff --git a/config-arm-generic b/config-arm-generic index 938815996..eb9af25a0 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -48,7 +48,7 @@ CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_CCI=y CONFIG_ARM_CCN=y CONFIG_ARM_CCI400_PMU=y -CONFIG_ARM_CCI500_PMU=y +CONFIG_ARM_CCI5xx_PMU=y CONFIG_ARM_DMA_USE_IOMMU=y CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 CONFIG_ARM_GIC=y @@ -120,6 +120,7 @@ CONFIG_ROCKCHIP_THERMAL=m CONFIG_DRM_ROCKCHIP=m CONFIG_ROCKCHIP_DW_HDMI=m CONFIG_ROCKCHIP_DW_MIPI_DSI=y +CONFIG_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_USB=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP=m @@ -514,6 +515,7 @@ CONFIG_NET_VENDOR_MELLANOX=y # drm # CONFIG_DRM_VMWGFX is not set # CONFIG_DRM_MSM_DSI is not set +# CONFIG_DRM_HDLCD 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 3dea9996e..85d0d9733 100644 --- a/config-generic +++ b/config-generic @@ -3338,6 +3338,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_DRM=m +CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_AST=m # do not enable on f17 or older @@ -3348,6 +3349,7 @@ CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_USERPTR=y # CONFIG_DRM_RADEON_UMS is not set CONFIG_DRM_AMDGPU=m +CONFIG_DRM_AMD_ACP=y # CONFIG_DRM_AMDGPU_CIK is not set CONFIG_DRM_AMDGPU_USERPTR=y CONFIG_DRM_AMD_POWERPLAY=y @@ -3360,6 +3362,7 @@ CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_I915_FBDEV=y # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set +CONFIG_DRM_I915_USERPTR=y CONFIG_DRM_VIA=m CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 @@ -1 +1 @@ -53d2e6976bd4042672ed7b90dfbf4b31635b7dcf +770c4c1119dbaa0e5e4c1f2e88ca8bfeb0d66b6d diff --git a/kernel.spec b/kernel.spec index 6c86abf4a..4d1b0bd10 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 17 +%define gitrev 18 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2160,6 +2160,10 @@ fi # # %changelog +* Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git18.1 +- Linux v4.5-10883-g770c4c1119db +- drm, arm64-perf, arc, udf, quota merges + * Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git17.1 - Linux v4.5-9714-g53d2e6976bd4 - xfs, f2fs, cgroup merges @@ -1,3 +1,3 @@ a60d48eee08ec0536d5efb17ca819aef linux-4.5.tar.xz 6f557fe90b800b615c85c2ca04da6154 perf-man-4.5.tar.gz -ad9608d5d9af9dbd329de4d42193d5f9 patch-4.5-git17.xz +a3447af4912b536e6d7d170b2bf18109 patch-4.5-git18.xz |