From c868e18352527009f164e0a2d2c648240f0d0570 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 17 May 2017 10:56:05 -0500 Subject: [PATCH] Linux v4.12-rc1-81-gb23afd3 --- baseconfig/CONFIG_HD44780 | 2 +- drm-i915-turn-off-wc-mmaps.patch | 21 --------------------- gitrev | 2 +- kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel-i686-PAE.config | 2 +- kernel-i686-PAEdebug.config | 2 +- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-ppc64-debug.config | 2 +- kernel-ppc64.config | 2 +- kernel-ppc64le-debug.config | 2 +- kernel-ppc64le.config | 2 +- kernel-ppc64p7-debug.config | 2 +- kernel-ppc64p7.config | 2 +- kernel-s390x-debug.config | 2 +- kernel-s390x.config | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- kernel.spec | 5 ++++- sources | 2 +- 25 files changed, 27 insertions(+), 45 deletions(-) delete mode 100644 drm-i915-turn-off-wc-mmaps.patch diff --git a/baseconfig/CONFIG_HD44780 b/baseconfig/CONFIG_HD44780 index 4254ce45e..22e6cf3b3 100644 --- a/baseconfig/CONFIG_HD44780 +++ b/baseconfig/CONFIG_HD44780 @@ -1 +1 @@ -# CONFIG_HD44780 is not set +CONFIG_HD44780=m diff --git a/drm-i915-turn-off-wc-mmaps.patch b/drm-i915-turn-off-wc-mmaps.patch deleted file mode 100644 index c81b89226..000000000 --- a/drm-i915-turn-off-wc-mmaps.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Dave Airlie -Date: Thu, 4 Jun 2015 07:12:20 -0400 -Subject: [PATCH] drm: i915: turn off wc mmaps - ---- - drivers/gpu/drm/i915/i915_dma.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c -index d2df321ba634..775a5b11a366 100644 ---- a/drivers/gpu/drm/i915/i915_dma.c -+++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -151,7 +151,7 @@ static int i915_getparam(struct drm_device *dev, void *data, - value = 1; - break; - case I915_PARAM_MMAP_VERSION: -- value = 1; -+ value = 0; - break; - case I915_PARAM_SUBSLICE_TOTAL: - value = INTEL_INFO(dev)->subslice_total; diff --git a/gitrev b/gitrev index 60a84e453..01b7c12e1 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -a95cfad947d5f40cfbf9ad3019575aac1d8ac7a6 +b23afd384801711ab6dbccd259cc14cb09a1dcaf diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index eb4eba4a8..ba738ab4d 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1747,7 +1747,7 @@ CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 2a01f0ed3..2c1e86bbf 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1730,7 +1730,7 @@ CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 6f1247cba..894a70201 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1888,7 +1888,7 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDQ_MASTER_OMAP=m CONFIG_HEADERS_CHECK=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 174de9ba7..5f805dcbf 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1793,7 +1793,7 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 4204f2e52..690b59183 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1776,7 +1776,7 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 1db8e0725..a03f83ff9 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1871,7 +1871,7 @@ CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDQ_MASTER_OMAP=m CONFIG_HEADERS_CHECK=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 457381a53..e81c305b3 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1628,7 +1628,7 @@ CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDMI_LPE_AUDIO=m CONFIG_HEADERS_CHECK=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index e06d48d54..db4c7c4c7 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -1646,7 +1646,7 @@ CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDMI_LPE_AUDIO=m CONFIG_HEADERS_CHECK=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 26c737024..3c79b48e6 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1646,7 +1646,7 @@ CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDMI_LPE_AUDIO=m CONFIG_HEADERS_CHECK=y diff --git a/kernel-i686.config b/kernel-i686.config index a426171d1..8aacfa7f0 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1628,7 +1628,7 @@ CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDMI_LPE_AUDIO=m CONFIG_HEADERS_CHECK=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index ceac2e602..7ba3b3bd3 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -1554,7 +1554,7 @@ CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_BOOTMEM_INFO_NODE=y # CONFIG_HCALL_STATS is not set -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 40d628a79..8faf42811 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -1536,7 +1536,7 @@ CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_BOOTMEM_INFO_NODE=y # CONFIG_HCALL_STATS is not set -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index ac4ade338..50520adf2 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1508,7 +1508,7 @@ CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_BOOTMEM_INFO_NODE=y # CONFIG_HCALL_STATS is not set -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index c1adb191c..e0aec0f61 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1490,7 +1490,7 @@ CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_BOOTMEM_INFO_NODE=y # CONFIG_HCALL_STATS is not set -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index c3ddeb886..15bbe24a4 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -1507,7 +1507,7 @@ CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_BOOTMEM_INFO_NODE=y # CONFIG_HCALL_STATS is not set -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 12eb430b7..68ad8ed06 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -1489,7 +1489,7 @@ CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_BOOTMEM_INFO_NODE=y # CONFIG_HCALL_STATS is not set -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 08d6db2be..52ce731db 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1472,7 +1472,7 @@ CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-s390x.config b/kernel-s390x.config index cc3416241..23cd4eca0 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1454,7 +1454,7 @@ CONFIG_HAMRADIO=y CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HEADERS_CHECK=y CONFIG_HERMES_CACHE_FW_ON_INIT=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index da77faa14..e6d37deca 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1672,7 +1672,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_MEMORY_PRESENT=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDMI_LPE_AUDIO=m CONFIG_HEADERS_CHECK=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 484a75216..0aba29be5 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1654,7 +1654,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HAVE_MEMORY_PRESENT=y -# CONFIG_HD44780 is not set +CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDMI_LPE_AUDIO=m CONFIG_HEADERS_CHECK=y diff --git a/kernel.spec b/kernel.spec index f0c8a4fe0..88a03de66 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2172,6 +2172,9 @@ fi # # %changelog +* Wed May 17 2017 Justin M. Forbes - 4.12.0-0.rc1.git2.1 +- Linux v4.12-rc1-81-gb23afd3 + * Tue May 16 2017 Justin M. Forbes - 4.12.0-0.rc1.git1.1 - Linux v4.12-rc1-66-ga95cfad - Reenable debugging options. diff --git a/sources b/sources index 0e8f7fd1e..355132eba 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 SHA512 (patch-4.12-rc1.xz) = e6144938e8368d2c9dd2a05c68a3f73c2122088a1a09c7c3a63b4f16c4a77b2267f102324f3ecb20101b645b4613cfd24b8907048c76bceb9c2b7a0795e43c84 -SHA512 (patch-4.12-rc1-git1.xz) = a5edb8788b7cbbd1fcd3b67aebe551701ee73216b3618d4d20990c196fa8d68977456031e421f248a40029ddd7dae89cc16b9081f00c0ca73d3e7c9cb1806817 +SHA512 (patch-4.12-rc1-git2.xz) = 72d8224e3d448f29697db8f34849916cd1d1dad57f6bb2e6de3b636b0a7363cc7ec6ac0e12cb44070718b4276eb2fab0bf033a4375e5c84f4311593a827dca4b