diff options
-rw-r--r-- | configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI (renamed from configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI) | 0 | ||||
-rw-r--r-- | configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC | 1 | ||||
-rw-r--r-- | configs/base-generic/arm/CONFIG_SIMPLE_PM_BUS | 1 | ||||
-rw-r--r-- | configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC | 1 | ||||
-rw-r--r-- | filter-aarch64.sh | 2 | ||||
-rw-r--r-- | filter-armv7hl.sh | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 4 | ||||
-rw-r--r-- | kernel-aarch64.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl.config | 4 | ||||
-rw-r--r-- | kernel.spec | 12 | ||||
-rw-r--r-- | sources | 3 |
14 files changed, 28 insertions, 18 deletions
diff --git a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI index cda1f60f8..cda1f60f8 100644 --- a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI +++ b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI diff --git a/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC new file mode 100644 index 000000000..146d9409f --- /dev/null +++ b/configs/base-generic/arm/CONFIG_DRM_SUN4I_HDMI_CEC @@ -0,0 +1 @@ +CONFIG_DRM_SUN4I_HDMI_CEC=y diff --git a/configs/base-generic/arm/CONFIG_SIMPLE_PM_BUS b/configs/base-generic/arm/CONFIG_SIMPLE_PM_BUS new file mode 100644 index 000000000..3cc21476a --- /dev/null +++ b/configs/base-generic/arm/CONFIG_SIMPLE_PM_BUS @@ -0,0 +1 @@ +CONFIG_SIMPLE_PM_BUS=y diff --git a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC b/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC deleted file mode 100644 index 8ba73409c..000000000 --- a/configs/base-generic/arm/armv7/CONFIG_DRM_SUN4I_HDMI_CEC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DRM_SUN4I_HDMI_CEC is not set diff --git a/filter-aarch64.sh b/filter-aarch64.sh index d45da673f..4ca60946f 100644 --- a/filter-aarch64.sh +++ b/filter-aarch64.sh @@ -13,6 +13,6 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds medi ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom" -drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i tinydrm vc4" +drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel radeon rockchip tegra sun4i sun4i-drm-hdmi tinydrm vc4" singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr" diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh index 254893398..c08e03d12 100644 --- a/filter-armv7hl.sh +++ b/filter-armv7hl.sh @@ -13,6 +13,6 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn media mem ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom" -drmdrvs="amd armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm omapdrm panel nouveau radeon rockchip sti sun4i tegra tilcdc tinydrm via vc4" +drmdrvs="amd armada bridge ast exynos etnaviv hisilicon i2c imx meson mgag200 msm omapdrm panel nouveau radeon rockchip sti sun4i sun4i-drm-hdmi tegra tilcdc tinydrm via vc4" singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr bq27xxx_battery_hdq" diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 8edf1fea5..a768e3f31 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1354,6 +1354,8 @@ CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set # CONFIG_DRM_SIS is not set # CONFIG_DRM_STM is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y +CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN8I_MIXER=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set @@ -5100,7 +5102,7 @@ CONFIG_SH_ETH=m # CONFIG_SIGMA is not set CONFIG_SIGMATEL_FIR=m CONFIG_SIGNED_PE_FILE_VERIFICATION=y -# CONFIG_SIMPLE_PM_BUS is not set +CONFIG_SIMPLE_PM_BUS=y CONFIG_SIS190=m CONFIG_SIS900=m # CONFIG_SKFP is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 8759ce2de..80aa2053f 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1344,6 +1344,8 @@ CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set # CONFIG_DRM_SIS is not set # CONFIG_DRM_STM is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y +CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN8I_MIXER=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set @@ -5078,7 +5080,7 @@ CONFIG_SH_ETH=m # CONFIG_SIGMA is not set CONFIG_SIGMATEL_FIR=m CONFIG_SIGNED_PE_FILE_VERIFICATION=y -# CONFIG_SIMPLE_PM_BUS is not set +CONFIG_SIMPLE_PM_BUS=y CONFIG_SIS190=m CONFIG_SIS900=m # CONFIG_SKFP is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index f5b7a851d..8d992f0e8 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1459,7 +1459,7 @@ CONFIG_DRM_SII9234=m CONFIG_DRM_STI=m # CONFIG_DRM_STM is not set CONFIG_DRM_SUN4I_BACKEND=m -# CONFIG_DRM_SUN4I_HDMI_CEC is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN8I_MIXER=m @@ -5479,7 +5479,7 @@ CONFIG_SI7020=m # CONFIG_SIGMA is not set CONFIG_SIGMATEL_FIR=m CONFIG_SIGNED_PE_FILE_VERIFICATION=y -# CONFIG_SIMPLE_PM_BUS is not set +CONFIG_SIMPLE_PM_BUS=y CONFIG_SIS190=m CONFIG_SIS900=m # CONFIG_SKFP is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 1c13c575f..59368635f 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1373,7 +1373,7 @@ CONFIG_DRM_SII9234=m CONFIG_DRM_STI=m # CONFIG_DRM_STM is not set CONFIG_DRM_SUN4I_BACKEND=m -# CONFIG_DRM_SUN4I_HDMI_CEC is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN8I_MIXER=m @@ -5156,7 +5156,7 @@ CONFIG_SI7020=m # CONFIG_SIGMA is not set CONFIG_SIGMATEL_FIR=m CONFIG_SIGNED_PE_FILE_VERIFICATION=y -# CONFIG_SIMPLE_PM_BUS is not set +CONFIG_SIMPLE_PM_BUS=y CONFIG_SIS190=m CONFIG_SIS900=m # CONFIG_SKFP is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 3f4aab2ce..ec8c09176 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1363,7 +1363,7 @@ CONFIG_DRM_SII9234=m CONFIG_DRM_STI=m # CONFIG_DRM_STM is not set CONFIG_DRM_SUN4I_BACKEND=m -# CONFIG_DRM_SUN4I_HDMI_CEC is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN8I_MIXER=m @@ -5134,7 +5134,7 @@ CONFIG_SI7020=m # CONFIG_SIGMA is not set CONFIG_SIGMATEL_FIR=m CONFIG_SIGNED_PE_FILE_VERIFICATION=y -# CONFIG_SIMPLE_PM_BUS is not set +CONFIG_SIMPLE_PM_BUS=y CONFIG_SIS190=m CONFIG_SIS900=m # CONFIG_SKFP is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index e38b5d1be..999575d74 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1449,7 +1449,7 @@ CONFIG_DRM_SII9234=m CONFIG_DRM_STI=m # CONFIG_DRM_STM is not set CONFIG_DRM_SUN4I_BACKEND=m -# CONFIG_DRM_SUN4I_HDMI_CEC is not set +CONFIG_DRM_SUN4I_HDMI_CEC=y CONFIG_DRM_SUN4I_HDMI=m CONFIG_DRM_SUN4I=m CONFIG_DRM_SUN8I_MIXER=m @@ -5457,7 +5457,7 @@ CONFIG_SI7020=m # CONFIG_SIGMA is not set CONFIG_SIGMATEL_FIR=m CONFIG_SIGNED_PE_FILE_VERIFICATION=y -# CONFIG_SIMPLE_PM_BUS is not set +CONFIG_SIMPLE_PM_BUS=y CONFIG_SIS190=m CONFIG_SIS900=m # CONFIG_SKFP is not set diff --git a/kernel.spec b/kernel.spec index dc5cb3bbb..e6bc376fa 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,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 1 +%global rcrev 2 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,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 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -2207,6 +2207,12 @@ fi # # %changelog +* Mon Dec 04 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc2.git0.1 +- Linux v4.15-rc2 + +* Mon Dec 04 2017 Laura Abbott <labbott@redhat.com> +- Disable debugging options. + * Fri Dec 01 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc1.git3.1 - Linux v4.15-rc1-396-ga0651c7fa2c0 @@ -1,4 +1,3 @@ SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8 -SHA512 (patch-4.15-rc1.xz) = 00cb666d762e46b2a965ce27a06272240e9dc375dc92644ade1a512f27ccea615ae609e3b685a0061614859acbdf28fd3d6bfb137e2208f2acc04114ff9fff46 -SHA512 (patch-4.15-rc1-git3.xz) = 4797b9c6275f214d737bb0cb6130bf188a1442a5b12ac96f220efa61ca9fc97ef3fd45a8075e26a7bd2c6d5d3b20efec5d5f4eebd397539121ed341db0c611c6 +SHA512 (patch-4.15-rc2.xz) = beacb7f7dea88819a391f4b0a10b7faf2ef5055dd53f7fe95ca5603c019ea7e5ff5d7af15fba08c4c6ba257d9bca7ce15a9320741a811a9b9c9fa5bbc0e78078 |