From 4717d555e292eb5c67e41fa771e00b204fbf5b1b Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 28 Mar 2017 07:49:37 -0700 Subject: [PATCH 01/12] Reenable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 431d68b4d..5735041ad 100644 --- a/kernel.spec +++ b/kernel.spec @@ -125,7 +125,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 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -2172,6 +2172,9 @@ fi # # %changelog +* Tue Mar 28 2017 Laura Abbott +- Reenable debugging options. + * Mon Mar 27 2017 Justin M. Forbes - CVE-2017-7261 vmwgfx: check that number of mip levels is above zero (rhbz 1435719 1435740) From c762bd18e3ed5a078827a0a3420d310f41f301c1 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Tue, 28 Mar 2017 07:54:51 -0700 Subject: [PATCH 02/12] Linux v4.11-rc4-18-gad0376e --- baseconfig/x86/x86_64/CONFIG_EDAC_PND2 | 1 + gitrev | 2 +- kernel-x86_64-debug.config | 1 + kernel-x86_64.config | 1 + kernel.spec | 5 ++++- sources | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 baseconfig/x86/x86_64/CONFIG_EDAC_PND2 diff --git a/baseconfig/x86/x86_64/CONFIG_EDAC_PND2 b/baseconfig/x86/x86_64/CONFIG_EDAC_PND2 new file mode 100644 index 000000000..d0b59df60 --- /dev/null +++ b/baseconfig/x86/x86_64/CONFIG_EDAC_PND2 @@ -0,0 +1 @@ +CONFIG_EDAC_PND2=m diff --git a/gitrev b/gitrev index defc91fb9..fcdf8f531 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -ebe64824e9de4b3ab3bd3928312b4b2bc57b4b7e +ad0376eb1483bd9880770b346f6592aece669e4c diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index a458b1634..5cbc52f62 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1321,6 +1321,7 @@ CONFIG_EDAC_I82975X=m CONFIG_EDAC_IE31200=m CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_PND2=m CONFIG_EDAC_R82600=m CONFIG_EDAC_SBRIDGE=m CONFIG_EDAC_SKX=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index a1225d4fa..8ecda716c 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1310,6 +1310,7 @@ CONFIG_EDAC_I82975X=m CONFIG_EDAC_IE31200=m CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_PND2=m CONFIG_EDAC_R82600=m CONFIG_EDAC_SBRIDGE=m CONFIG_EDAC_SKX=m diff --git a/kernel.spec b/kernel.spec index 5735041ad..b17d27933 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2172,6 +2172,9 @@ fi # # %changelog +* Tue Mar 28 2017 Laura Abbott - 4.11.0-0.rc4.git1.1 +- Linux v4.11-rc4-18-gad0376e + * Tue Mar 28 2017 Laura Abbott - Reenable debugging options. diff --git a/sources b/sources index 45086ad7d..6b5943b73 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 SHA512 (patch-4.11-rc4.xz) = d92866ffe4997a5e489c034fc1c378d7e588f76cfa18d642854ce0bf412cdbc82d8e850d6665fa5175084ec0b7662b0f53435231d2b46b13cefbb9ba63f73791 +SHA512 (patch-4.11-rc4-git1.xz) = 734f0d07977641fd9d41946d2800d98c6e0363df500d8b75c00ebf6dd35ca19392bfdf8655ed6488bad1a94fe29c532f9f44233c8ec5d54e9fc50faa83c924b7 From a4579f8907c1ee767a4737e6102749da80c36f50 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Wed, 29 Mar 2017 07:29:47 -0700 Subject: [PATCH 03/12] Linux v4.11-rc4-40-gfe82203 --- gitrev | 2 +- kernel.spec | 8 +-- sources | 2 +- ...x-out-of-bound-access-for-msix_names.patch | 56 ------------------- 4 files changed, 6 insertions(+), 62 deletions(-) delete mode 100644 virtio_pci-fix-out-of-bound-access-for-msix_names.patch diff --git a/gitrev b/gitrev index fcdf8f531..77410dc4e 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -ad0376eb1483bd9880770b346f6592aece669e4c +fe82203b63e598c34d96e846dea49679a726fc7a diff --git a/kernel.spec b/kernel.spec index b17d27933..8b0ef5aae 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -602,9 +602,6 @@ Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch #CVE-2016-3134 rhbz 1317383 1317384 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch -# Fix virtio devices rhbz 1430297 -Patch669: virtio_pci-fix-out-of-bound-access-for-msix_names.patch - #CVE-2017-7261 rhbz 1435719 1435740 Patch670: vmwgfx-check-that-number-of-mip-levels-is-above-zero.patch @@ -2172,6 +2169,9 @@ fi # # %changelog +* Wed Mar 29 2017 Laura Abbott - 4.11.0-0.rc4.git2.1 +- Linux v4.11-rc4-40-gfe82203 + * Tue Mar 28 2017 Laura Abbott - 4.11.0-0.rc4.git1.1 - Linux v4.11-rc4-18-gad0376e diff --git a/sources b/sources index 6b5943b73..beb268988 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 SHA512 (patch-4.11-rc4.xz) = d92866ffe4997a5e489c034fc1c378d7e588f76cfa18d642854ce0bf412cdbc82d8e850d6665fa5175084ec0b7662b0f53435231d2b46b13cefbb9ba63f73791 -SHA512 (patch-4.11-rc4-git1.xz) = 734f0d07977641fd9d41946d2800d98c6e0363df500d8b75c00ebf6dd35ca19392bfdf8655ed6488bad1a94fe29c532f9f44233c8ec5d54e9fc50faa83c924b7 +SHA512 (patch-4.11-rc4-git2.xz) = 74ca2f5554088825e1d861a9d66b463f3828265ac2c5e94a6f27fd2175c70fd03bff93ddd929afecdfdcce870b637a808466a4a61707112a451ab256e6ed24a7 diff --git a/virtio_pci-fix-out-of-bound-access-for-msix_names.patch b/virtio_pci-fix-out-of-bound-access-for-msix_names.patch deleted file mode 100644 index d87676674..000000000 --- a/virtio_pci-fix-out-of-bound-access-for-msix_names.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Jason Wang -Date: Thu, 23 Mar 2017 13:07:16 +0800 -Subject: [PATCH] virtio_pci: fix out of bound access for msix_names - ---- - drivers/virtio/virtio_pci_common.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c -index df548a6..5905349 100644 ---- a/drivers/virtio/virtio_pci_common.c -+++ b/drivers/virtio/virtio_pci_common.c -@@ -147,7 +147,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, - { - struct virtio_pci_device *vp_dev = to_vp_device(vdev); - const char *name = dev_name(&vp_dev->vdev.dev); -- int i, err = -ENOMEM, allocated_vectors, nvectors; -+ int i, j, err = -ENOMEM, allocated_vectors, nvectors; - unsigned flags = PCI_IRQ_MSIX; - bool shared = false; - u16 msix_vec; -@@ -212,7 +212,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, - if (!vp_dev->msix_vector_map) - goto out_disable_config_irq; - -- allocated_vectors = 1; /* vector 0 is the config interrupt */ -+ allocated_vectors = j = 1; /* vector 0 is the config interrupt */ - for (i = 0; i < nvqs; ++i) { - if (!names[i]) { - vqs[i] = NULL; -@@ -236,18 +236,19 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs, - continue; - } - -- snprintf(vp_dev->msix_names[i + 1], -+ snprintf(vp_dev->msix_names[j], - sizeof(*vp_dev->msix_names), "%s-%s", - dev_name(&vp_dev->vdev.dev), names[i]); - err = request_irq(pci_irq_vector(vp_dev->pci_dev, msix_vec), - vring_interrupt, IRQF_SHARED, -- vp_dev->msix_names[i + 1], vqs[i]); -+ vp_dev->msix_names[j], vqs[i]); - if (err) { - /* don't free this irq on error */ - vp_dev->msix_vector_map[i] = VIRTIO_MSI_NO_VECTOR; - goto out_remove_vqs; - } - vp_dev->msix_vector_map[i] = msix_vec; -+ j++; - - /* - * Use a different vector for each queue if they are available, --- -2.7.4 - - From 2439f8931750cb2d248803aea0a6802afc29df49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 29 Mar 2017 11:42:17 +0200 Subject: [PATCH 04/12] enable THP on Power (#1434007) [labbott: Build the kernel configs, add rpm changelog) --- baseconfig/powerpc/CONFIG_DEV_DAX | 1 + baseconfig/powerpc/CONFIG_DEV_DAX_PMEM | 1 + baseconfig/powerpc/CONFIG_NR_DEV_DAX | 1 + baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE | 2 +- baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE | 1 + kernel-ppc64-debug.config | 6 +++++- kernel-ppc64.config | 6 +++++- kernel-ppc64le-debug.config | 6 +++++- kernel-ppc64le.config | 6 +++++- kernel-ppc64p7-debug.config | 6 +++++- kernel-ppc64p7.config | 6 +++++- kernel.spec | 3 +++ 12 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 baseconfig/powerpc/CONFIG_DEV_DAX create mode 100644 baseconfig/powerpc/CONFIG_DEV_DAX_PMEM create mode 100644 baseconfig/powerpc/CONFIG_NR_DEV_DAX create mode 100644 baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX b/baseconfig/powerpc/CONFIG_DEV_DAX new file mode 100644 index 000000000..77478a213 --- /dev/null +++ b/baseconfig/powerpc/CONFIG_DEV_DAX @@ -0,0 +1 @@ +CONFIG_DEV_DAX=m diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM b/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM new file mode 100644 index 000000000..8c7fd6732 --- /dev/null +++ b/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM @@ -0,0 +1 @@ +CONFIG_DEV_DAX_PMEM=m diff --git a/baseconfig/powerpc/CONFIG_NR_DEV_DAX b/baseconfig/powerpc/CONFIG_NR_DEV_DAX new file mode 100644 index 000000000..3fd0f86b1 --- /dev/null +++ b/baseconfig/powerpc/CONFIG_NR_DEV_DAX @@ -0,0 +1 @@ +CONFIG_NR_DEV_DAX=32768 diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE index 4874a851b..75d999c66 100644 --- a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE +++ b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE @@ -1 +1 @@ -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE=y diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE new file mode 100644 index 000000000..f9a942f2c --- /dev/null +++ b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE @@ -0,0 +1 @@ +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 9d7ecaab3..3ba077273 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -993,6 +993,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3461,6 +3463,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -5086,7 +5089,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index d9e915837..dfb86ac9d 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -983,6 +983,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3439,6 +3441,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -5062,7 +5065,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 235eb52d4..783c7824d 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -948,6 +948,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3406,6 +3408,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -5015,7 +5018,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index aa3d835b5..2d23fab1a 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -938,6 +938,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3384,6 +3386,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -4991,7 +4994,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 14153e3c5..03a216c2c 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -948,6 +948,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3405,6 +3407,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -5014,7 +5017,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 2baf5ea37..2821682a3 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -938,6 +938,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_DEFXX is not set # CONFIG_DETECT_HUNG_TASK is not set CONFIG_DEV_APPLETALK=m +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVFREQ_GOV_PASSIVE is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set @@ -3383,6 +3385,7 @@ CONFIG_NOUVEAU_DEBUG=5 CONFIG_NOUVEAU_DEBUG_DEFAULT=3 CONFIG_NOZOMI=m CONFIG_NR_CPUS=1024 +CONFIG_NR_DEV_DAX=32768 CONFIG_NR_IRQS=512 CONFIG_NS83820=m CONFIG_NSC_FIR=m @@ -4990,7 +4993,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACE_SINK is not set # CONFIG_TRACING_EVENTS_GPIO is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TR is not set CONFIG_TRUSTED_KEYS=m # CONFIG_TS4800_IRQ is not set diff --git a/kernel.spec b/kernel.spec index 8b0ef5aae..2284f0f38 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2169,6 +2169,9 @@ fi # # %changelog +* Wed Mar 29 2017 Dan Horák +- Enable THP on Power (rhbz 1434007) + * Wed Mar 29 2017 Laura Abbott - 4.11.0-0.rc4.git2.1 - Linux v4.11-rc4-40-gfe82203 From fbfe487258105a0e00a7ced92ac96cdb0a91aacc Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Thu, 30 Mar 2017 08:01:55 -0700 Subject: [PATCH 05/12] Linux v4.11-rc4-64-g89970a0 --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index 77410dc4e..f50195b83 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -fe82203b63e598c34d96e846dea49679a726fc7a +89970a04d70c6c9e5e4492fd4096c0b5630a478c diff --git a/kernel.spec b/kernel.spec index 2284f0f38..c33ef11d4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2169,6 +2169,9 @@ fi # # %changelog +* Thu Mar 30 2017 Laura Abbott - 4.11.0-0.rc4.git3.1 +- Linux v4.11-rc4-64-g89970a0 + * Wed Mar 29 2017 Dan Horák - Enable THP on Power (rhbz 1434007) diff --git a/sources b/sources index beb268988..7d35ffe36 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 SHA512 (patch-4.11-rc4.xz) = d92866ffe4997a5e489c034fc1c378d7e588f76cfa18d642854ce0bf412cdbc82d8e850d6665fa5175084ec0b7662b0f53435231d2b46b13cefbb9ba63f73791 -SHA512 (patch-4.11-rc4-git2.xz) = 74ca2f5554088825e1d861a9d66b463f3828265ac2c5e94a6f27fd2175c70fd03bff93ddd929afecdfdcce870b637a808466a4a61707112a451ab256e6ed24a7 +SHA512 (patch-4.11-rc4-git3.xz) = 7d2e643cae2083bf012ff164930ded87787fe8d3e111a2a63db3ee4b1f6c2539cd03f2a4c75a46c5b4472d8cc7c77a0f122bb340b5fcf192e55ed881ba2f94d1 From 005a90487824b7107585903017e3f53280e39389 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 2 Apr 2017 11:26:39 +0100 Subject: [PATCH 06/12] Enable STi DRM driver --- baseconfig/arm/armv7/CONFIG_DRM_STI | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel.spec | 3 +++ 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/baseconfig/arm/armv7/CONFIG_DRM_STI b/baseconfig/arm/armv7/CONFIG_DRM_STI index 008714f93..d16e09b9b 100644 --- a/baseconfig/arm/armv7/CONFIG_DRM_STI +++ b/baseconfig/arm/armv7/CONFIG_DRM_STI @@ -1 +1 @@ -# CONFIG_DRM_STI is not set +CONFIG_DRM_STI=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index db30b0dff..5ce611660 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1397,7 +1397,7 @@ CONFIG_DRM_ROCKCHIP=m # CONFIG_DRM_SII902X is not set CONFIG_DRM_SIL_SII8620=m # CONFIG_DRM_SIS is not set -# CONFIG_DRM_STI is not set +CONFIG_DRM_STI=m CONFIG_DRM_SUN4I=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 845532ac5..12cfa68a1 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1321,7 +1321,7 @@ CONFIG_DRM_ROCKCHIP=m # CONFIG_DRM_SII902X is not set CONFIG_DRM_SIL_SII8620=m # CONFIG_DRM_SIS is not set -# CONFIG_DRM_STI is not set +CONFIG_DRM_STI=m CONFIG_DRM_SUN4I=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 9dff4cdd4..0324b0036 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1311,7 +1311,7 @@ CONFIG_DRM_ROCKCHIP=m # CONFIG_DRM_SII902X is not set CONFIG_DRM_SIL_SII8620=m # CONFIG_DRM_SIS is not set -# CONFIG_DRM_STI is not set +CONFIG_DRM_STI=m CONFIG_DRM_SUN4I=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 6db1bb12e..0484059b5 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1387,7 +1387,7 @@ CONFIG_DRM_ROCKCHIP=m # CONFIG_DRM_SII902X is not set CONFIG_DRM_SIL_SII8620=m # CONFIG_DRM_SIS is not set -# CONFIG_DRM_STI is not set +CONFIG_DRM_STI=m CONFIG_DRM_SUN4I=m # CONFIG_DRM_TDFX is not set # CONFIG_DRM_TEGRA_DEBUG is not set diff --git a/kernel.spec b/kernel.spec index c33ef11d4..ca2138c75 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2169,6 +2169,9 @@ fi # # %changelog +* Sun Apr 1 2017 Peter Robinson +- Enable STi DRM driver + * Thu Mar 30 2017 Laura Abbott - 4.11.0-0.rc4.git3.1 - Linux v4.11-rc4-64-g89970a0 From f34cd3b90143f602043a26492cb82799f9eaa404 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 2 Apr 2017 23:46:37 +0100 Subject: [PATCH 07/12] minor config cleanups (NFC) --- baseconfig/CONFIG_BATTERY_GOLDFISH | 1 - baseconfig/CONFIG_FB_GOLDFISH | 1 - baseconfig/CONFIG_MFD_SUN4I_GPADC | 1 - baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG | 1 - baseconfig/CONFIG_SUN50I_A64_CCU | 1 - baseconfig/CONFIG_SUN6I_A31_CCU | 1 - baseconfig/CONFIG_SUN8I_A23_CCU | 1 - baseconfig/CONFIG_SUN8I_A33_CCU | 1 - baseconfig/CONFIG_SUNXI_CCU | 1 - baseconfig/arm/CONFIG_MFD_SUN4I_GPADC | 1 - baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG | 1 - baseconfig/{ => x86}/CONFIG_FB_ARC | 0 baseconfig/{ => x86}/CONFIG_FB_GEODE | 0 baseconfig/{ => x86}/CONFIG_FB_HGA | 0 baseconfig/{ => x86}/CONFIG_FB_I810 | 0 baseconfig/{ => x86}/CONFIG_FB_I810_GTF | 0 baseconfig/{ => x86}/CONFIG_FB_I810_I2C | 0 baseconfig/{ => x86}/CONFIG_FB_LE80578 | 0 baseconfig/{ => x86}/CONFIG_FB_VGA16 | 0 baseconfig/{ => x86}/CONFIG_FB_VIA | 0 .../{ => x86}/CONFIG_FB_VIA_DIRECT_PROCFS | 0 kernel-aarch64-debug.config | 12 ------------ kernel-aarch64.config | 12 ------------ kernel-armv7hl-debug.config | 12 ------------ kernel-armv7hl-lpae-debug.config | 12 ------------ kernel-armv7hl-lpae.config | 12 ------------ kernel-armv7hl.config | 12 ------------ kernel-i686-PAE.config | 9 --------- kernel-i686-PAEdebug.config | 9 --------- kernel-i686-debug.config | 9 --------- kernel-i686.config | 9 --------- kernel-ppc64-debug.config | 18 ------------------ kernel-ppc64.config | 18 ------------------ kernel-ppc64le-debug.config | 18 ------------------ kernel-ppc64le.config | 18 ------------------ kernel-ppc64p7-debug.config | 18 ------------------ kernel-ppc64p7.config | 18 ------------------ kernel-s390x-debug.config | 19 ------------------- kernel-s390x.config | 19 ------------------- kernel-x86_64-debug.config | 9 --------- kernel-x86_64.config | 9 --------- 41 files changed, 283 deletions(-) delete mode 100644 baseconfig/CONFIG_BATTERY_GOLDFISH delete mode 100644 baseconfig/CONFIG_FB_GOLDFISH delete mode 100644 baseconfig/CONFIG_MFD_SUN4I_GPADC delete mode 100644 baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG delete mode 100644 baseconfig/CONFIG_SUN50I_A64_CCU delete mode 100644 baseconfig/CONFIG_SUN6I_A31_CCU delete mode 100644 baseconfig/CONFIG_SUN8I_A23_CCU delete mode 100644 baseconfig/CONFIG_SUN8I_A33_CCU delete mode 100644 baseconfig/CONFIG_SUNXI_CCU delete mode 100644 baseconfig/arm/CONFIG_MFD_SUN4I_GPADC delete mode 100644 baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG rename baseconfig/{ => x86}/CONFIG_FB_ARC (100%) rename baseconfig/{ => x86}/CONFIG_FB_GEODE (100%) rename baseconfig/{ => x86}/CONFIG_FB_HGA (100%) rename baseconfig/{ => x86}/CONFIG_FB_I810 (100%) rename baseconfig/{ => x86}/CONFIG_FB_I810_GTF (100%) rename baseconfig/{ => x86}/CONFIG_FB_I810_I2C (100%) rename baseconfig/{ => x86}/CONFIG_FB_LE80578 (100%) rename baseconfig/{ => x86}/CONFIG_FB_VGA16 (100%) rename baseconfig/{ => x86}/CONFIG_FB_VIA (100%) rename baseconfig/{ => x86}/CONFIG_FB_VIA_DIRECT_PROCFS (100%) diff --git a/baseconfig/CONFIG_BATTERY_GOLDFISH b/baseconfig/CONFIG_BATTERY_GOLDFISH deleted file mode 100644 index 75b9c00e9..000000000 --- a/baseconfig/CONFIG_BATTERY_GOLDFISH +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BATTERY_GOLDFISH is not set diff --git a/baseconfig/CONFIG_FB_GOLDFISH b/baseconfig/CONFIG_FB_GOLDFISH deleted file mode 100644 index 522a715d1..000000000 --- a/baseconfig/CONFIG_FB_GOLDFISH +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_FB_GOLDFISH is not set diff --git a/baseconfig/CONFIG_MFD_SUN4I_GPADC b/baseconfig/CONFIG_MFD_SUN4I_GPADC deleted file mode 100644 index d156cb188..000000000 --- a/baseconfig/CONFIG_MFD_SUN4I_GPADC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MFD_SUN4I_GPADC=m diff --git a/baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG deleted file mode 100644 index 28ea30190..000000000 --- a/baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SUN8I_CODEC_ANALOG=m diff --git a/baseconfig/CONFIG_SUN50I_A64_CCU b/baseconfig/CONFIG_SUN50I_A64_CCU deleted file mode 100644 index 9ce6c792a..000000000 --- a/baseconfig/CONFIG_SUN50I_A64_CCU +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SUN50I_A64_CCU is not set diff --git a/baseconfig/CONFIG_SUN6I_A31_CCU b/baseconfig/CONFIG_SUN6I_A31_CCU deleted file mode 100644 index 5ce1bb3f7..000000000 --- a/baseconfig/CONFIG_SUN6I_A31_CCU +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SUN6I_A31_CCU is not set diff --git a/baseconfig/CONFIG_SUN8I_A23_CCU b/baseconfig/CONFIG_SUN8I_A23_CCU deleted file mode 100644 index 26ae1100c..000000000 --- a/baseconfig/CONFIG_SUN8I_A23_CCU +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SUN8I_A23_CCU is not set diff --git a/baseconfig/CONFIG_SUN8I_A33_CCU b/baseconfig/CONFIG_SUN8I_A33_CCU deleted file mode 100644 index e1a357ee8..000000000 --- a/baseconfig/CONFIG_SUN8I_A33_CCU +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SUN8I_A33_CCU is not set diff --git a/baseconfig/CONFIG_SUNXI_CCU b/baseconfig/CONFIG_SUNXI_CCU deleted file mode 100644 index a383113ef..000000000 --- a/baseconfig/CONFIG_SUNXI_CCU +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SUNXI_CCU is not set diff --git a/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC b/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC deleted file mode 100644 index d156cb188..000000000 --- a/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MFD_SUN4I_GPADC=m diff --git a/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG deleted file mode 100644 index 28ea30190..000000000 --- a/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SUN8I_CODEC_ANALOG=m diff --git a/baseconfig/CONFIG_FB_ARC b/baseconfig/x86/CONFIG_FB_ARC similarity index 100% rename from baseconfig/CONFIG_FB_ARC rename to baseconfig/x86/CONFIG_FB_ARC diff --git a/baseconfig/CONFIG_FB_GEODE b/baseconfig/x86/CONFIG_FB_GEODE similarity index 100% rename from baseconfig/CONFIG_FB_GEODE rename to baseconfig/x86/CONFIG_FB_GEODE diff --git a/baseconfig/CONFIG_FB_HGA b/baseconfig/x86/CONFIG_FB_HGA similarity index 100% rename from baseconfig/CONFIG_FB_HGA rename to baseconfig/x86/CONFIG_FB_HGA diff --git a/baseconfig/CONFIG_FB_I810 b/baseconfig/x86/CONFIG_FB_I810 similarity index 100% rename from baseconfig/CONFIG_FB_I810 rename to baseconfig/x86/CONFIG_FB_I810 diff --git a/baseconfig/CONFIG_FB_I810_GTF b/baseconfig/x86/CONFIG_FB_I810_GTF similarity index 100% rename from baseconfig/CONFIG_FB_I810_GTF rename to baseconfig/x86/CONFIG_FB_I810_GTF diff --git a/baseconfig/CONFIG_FB_I810_I2C b/baseconfig/x86/CONFIG_FB_I810_I2C similarity index 100% rename from baseconfig/CONFIG_FB_I810_I2C rename to baseconfig/x86/CONFIG_FB_I810_I2C diff --git a/baseconfig/CONFIG_FB_LE80578 b/baseconfig/x86/CONFIG_FB_LE80578 similarity index 100% rename from baseconfig/CONFIG_FB_LE80578 rename to baseconfig/x86/CONFIG_FB_LE80578 diff --git a/baseconfig/CONFIG_FB_VGA16 b/baseconfig/x86/CONFIG_FB_VGA16 similarity index 100% rename from baseconfig/CONFIG_FB_VGA16 rename to baseconfig/x86/CONFIG_FB_VGA16 diff --git a/baseconfig/CONFIG_FB_VIA b/baseconfig/x86/CONFIG_FB_VIA similarity index 100% rename from baseconfig/CONFIG_FB_VIA rename to baseconfig/x86/CONFIG_FB_VIA diff --git a/baseconfig/CONFIG_FB_VIA_DIRECT_PROCFS b/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS similarity index 100% rename from baseconfig/CONFIG_FB_VIA_DIRECT_PROCFS rename to baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 4313d4c15..326dff36e 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -454,7 +454,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1497,7 +1496,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y CONFIG_FAULT_INJECTION=y # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set CONFIG_FB_ARMCLCD=y # CONFIG_FB_ASILIANT is not set @@ -1515,18 +1513,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_DA8XX is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1570,9 +1561,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -CONFIG_FB_VGA16=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index ead8d4905..5ef00d93a 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -454,7 +454,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1480,7 +1479,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_FS=m # CONFIG_FAULT_INJECTION is not set # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set CONFIG_FB_ARMCLCD=y # CONFIG_FB_ASILIANT is not set @@ -1498,18 +1496,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_DA8XX is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1553,9 +1544,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -CONFIG_FB_VGA16=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 5ce611660..212fd1cb3 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -499,7 +499,6 @@ CONFIG_BATTERY_DA9052=m # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set CONFIG_BATTERY_RX51=m @@ -1634,7 +1633,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y CONFIG_FAULT_INJECTION=y # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set CONFIG_FB_ARMCLCD=y # CONFIG_FB_ASILIANT is not set @@ -1652,19 +1650,12 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_DA8XX is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_IMX is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1711,9 +1702,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -CONFIG_FB_VGA16=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 12cfa68a1..96803968f 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -479,7 +479,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set CONFIG_BATTERY_SBS=m @@ -1554,7 +1553,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y CONFIG_FAULT_INJECTION=y # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set CONFIG_FB_ARMCLCD=y # CONFIG_FB_ASILIANT is not set @@ -1572,18 +1570,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_DA8XX is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1628,9 +1619,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -CONFIG_FB_VGA16=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 0324b0036..e1bee0da3 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -478,7 +478,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set CONFIG_BATTERY_SBS=m @@ -1537,7 +1536,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_FS=m # CONFIG_FAULT_INJECTION is not set # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set CONFIG_FB_ARMCLCD=y # CONFIG_FB_ASILIANT is not set @@ -1555,18 +1553,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_DA8XX is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1611,9 +1602,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -CONFIG_FB_VGA16=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 0484059b5..e7d7586d1 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -498,7 +498,6 @@ CONFIG_BATTERY_DA9052=m # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set CONFIG_BATTERY_RX51=m @@ -1617,7 +1616,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_FS=m # CONFIG_FAULT_INJECTION is not set # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set CONFIG_FB_ARMCLCD=y # CONFIG_FB_ASILIANT is not set @@ -1635,19 +1633,12 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_DA8XX is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_IMX is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1694,9 +1685,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -CONFIG_FB_VGA16=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index a4de0f1c0..f8eca8a22 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -381,7 +381,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set CONFIG_BATTERY_OLPC=y @@ -1390,7 +1389,6 @@ CONFIG_FB_EFI=y CONFIG_FB_GEODE_GX=y CONFIG_FB_GEODE_LX=y CONFIG_FB_GEODE=y -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set # CONFIG_FB_HGA is not set CONFIG_FB_HYPERV=m @@ -2841,7 +2839,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4898,7 +4895,6 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -5008,10 +5004,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -5020,7 +5012,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SURFACE_PRO3_BUTTON=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 128e7035c..050de6842 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -382,7 +382,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set CONFIG_BATTERY_OLPC=y @@ -1408,7 +1407,6 @@ CONFIG_FB_EFI=y CONFIG_FB_GEODE_GX=y CONFIG_FB_GEODE_LX=y CONFIG_FB_GEODE=y -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set # CONFIG_FB_HGA is not set CONFIG_FB_HYPERV=m @@ -2861,7 +2859,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4920,7 +4917,6 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -5030,10 +5026,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -5042,7 +5034,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SURFACE_PRO3_BUTTON=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 094d8e01a..c73211bac 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -382,7 +382,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set CONFIG_BATTERY_OLPC=y @@ -1408,7 +1407,6 @@ CONFIG_FB_EFI=y CONFIG_FB_GEODE_GX=y CONFIG_FB_GEODE_LX=y CONFIG_FB_GEODE=y -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set # CONFIG_FB_HGA is not set CONFIG_FB_HYPERV=m @@ -2861,7 +2859,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4920,7 +4917,6 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -5030,10 +5026,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -5042,7 +5034,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SURFACE_PRO3_BUTTON=m diff --git a/kernel-i686.config b/kernel-i686.config index 329784839..04852c4be 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -381,7 +381,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set CONFIG_BATTERY_OLPC=y @@ -1390,7 +1389,6 @@ CONFIG_FB_EFI=y CONFIG_FB_GEODE_GX=y CONFIG_FB_GEODE_LX=y CONFIG_FB_GEODE=y -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set # CONFIG_FB_HGA is not set CONFIG_FB_HYPERV=m @@ -2841,7 +2839,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4898,7 +4895,6 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -5008,10 +5004,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -5020,7 +5012,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SURFACE_PRO3_BUTTON=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 3ba077273..2a6cec8c4 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -330,7 +330,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1316,7 +1315,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y CONFIG_FAULT_INJECTION=y # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set # CONFIG_FB_ASILIANT is not set CONFIG_FB_ATY128_BACKLIGHT=y @@ -1334,18 +1332,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m CONFIG_FB_IBM_GXT4500=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set CONFIG_FB_MATROX_G=y # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX_MILLENIUM is not set @@ -1396,8 +1387,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_VALKYRIE is not set CONFIG_FB_VESA=y # CONFIG_FB_VGA16 is not set -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2731,7 +2720,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4746,7 +4734,6 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -4849,10 +4836,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -4861,7 +4844,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index dfb86ac9d..b98c1e749 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -329,7 +329,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1298,7 +1297,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_FS=m # CONFIG_FAULT_INJECTION is not set # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set # CONFIG_FB_ASILIANT is not set CONFIG_FB_ATY128_BACKLIGHT=y @@ -1316,18 +1314,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m CONFIG_FB_IBM_GXT4500=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set CONFIG_FB_MATROX_G=y # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX_MILLENIUM is not set @@ -1378,8 +1369,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_VALKYRIE is not set CONFIG_FB_VESA=y # CONFIG_FB_VGA16 is not set -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2710,7 +2699,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4722,7 +4710,6 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -4825,10 +4812,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -4837,7 +4820,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 783c7824d..b09390184 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -324,7 +324,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1270,7 +1269,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y CONFIG_FAULT_INJECTION=y # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set # CONFIG_FB_ASILIANT is not set CONFIG_FB_ATY128_BACKLIGHT=y @@ -1288,18 +1286,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m CONFIG_FB_IBM_GXT4500=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set CONFIG_FB_MATROX_G=y # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX_MILLENIUM is not set @@ -1350,8 +1341,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_VALKYRIE is not set CONFIG_FB_VESA=y # CONFIG_FB_VGA16 is not set -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2677,7 +2666,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4675,7 +4663,6 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -4778,10 +4765,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -4790,7 +4773,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 2d23fab1a..0a00d0798 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -323,7 +323,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1252,7 +1251,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_FS=m # CONFIG_FAULT_INJECTION is not set # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set # CONFIG_FB_ASILIANT is not set CONFIG_FB_ATY128_BACKLIGHT=y @@ -1270,18 +1268,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m CONFIG_FB_IBM_GXT4500=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set CONFIG_FB_MATROX_G=y # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX_MILLENIUM is not set @@ -1332,8 +1323,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_VALKYRIE is not set CONFIG_FB_VESA=y # CONFIG_FB_VGA16 is not set -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2656,7 +2645,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4651,7 +4639,6 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -4754,10 +4741,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -4766,7 +4749,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 03a216c2c..8eac87e07 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -324,7 +324,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1269,7 +1268,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y CONFIG_FAULT_INJECTION=y # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set # CONFIG_FB_ASILIANT is not set CONFIG_FB_ATY128_BACKLIGHT=y @@ -1287,18 +1285,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m CONFIG_FB_IBM_GXT4500=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set CONFIG_FB_MATROX_G=y # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX_MILLENIUM is not set @@ -1349,8 +1340,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_VALKYRIE is not set CONFIG_FB_VESA=y # CONFIG_FB_VGA16 is not set -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2676,7 +2665,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4674,7 +4662,6 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -4777,10 +4764,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -4789,7 +4772,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 2821682a3..0a26a33d8 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -323,7 +323,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1251,7 +1250,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_FS=m # CONFIG_FAULT_INJECTION is not set # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set # CONFIG_FB_ASILIANT is not set CONFIG_FB_ATY128_BACKLIGHT=y @@ -1269,18 +1267,11 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m CONFIG_FB_IBM_GXT4500=y # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set CONFIG_FB_MATROX_G=y # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX_MILLENIUM is not set @@ -1331,8 +1322,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_VALKYRIE is not set CONFIG_FB_VESA=y # CONFIG_FB_VGA16 is not set -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2655,7 +2644,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4650,7 +4638,6 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -4753,10 +4740,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -4765,7 +4748,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SUSPEND_FREEZER=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 9b6e68bb8..1e8740466 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -324,7 +324,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1260,7 +1259,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y CONFIG_FAULT_INJECTION=y # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set # CONFIG_FB_ASILIANT is not set CONFIG_FB_ATY128_BACKLIGHT=y @@ -1276,19 +1274,12 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1331,9 +1322,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -CONFIG_FB_VGA16=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2613,7 +2601,6 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4569,7 +4556,6 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -4670,10 +4656,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -4682,7 +4664,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m # CONFIG_SUSPEND is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 176b160ed..639889b55 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -323,7 +323,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1242,7 +1241,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii" CONFIG_FAT_FS=m # CONFIG_FAULT_INJECTION is not set # CONFIG_FB_3DFX is not set -# CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set # CONFIG_FB_ASILIANT is not set CONFIG_FB_ATY128_BACKLIGHT=y @@ -1258,19 +1256,12 @@ CONFIG_FB_ATY_BACKLIGHT=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set -# CONFIG_FB_HGA is not set # CONFIG_FB_I740 is not set -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_I810=m # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB is not set # CONFIG_FB_KYRO is not set -# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1313,9 +1304,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y -CONFIG_FB_VGA16=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -# CONFIG_FB_VIA is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2592,7 +2580,6 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4545,7 +4532,6 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -4646,10 +4632,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -4658,7 +4640,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m # CONFIG_SUSPEND is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 5cbc52f62..2488ea90a 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -380,7 +380,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1439,7 +1438,6 @@ CONFIG_FB_ATY_BACKLIGHT=y CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set # CONFIG_FB_HGA is not set CONFIG_FB_HYPERV=m @@ -2894,7 +2892,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4950,7 +4947,6 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -5063,10 +5059,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -5075,7 +5067,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SURFACE_PRO3_BUTTON=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 8ecda716c..d70b202f0 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -379,7 +379,6 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_SBS is not set @@ -1421,7 +1420,6 @@ CONFIG_FB_ATY_BACKLIGHT=y CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_GEODE is not set -# CONFIG_FB_GOLDFISH is not set # CONFIG_FB_HECUBA is not set # CONFIG_FB_HGA is not set CONFIG_FB_HYPERV=m @@ -2874,7 +2872,6 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set -CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set @@ -4928,7 +4925,6 @@ CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set -CONFIG_SND_SUN8I_CODEC_ANALOG=m # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_TRIDENT=m CONFIG_SND_USB_6FIRE=m @@ -5041,10 +5037,6 @@ CONFIG_STMMAC_ETH=m CONFIG_STRICT_DEVMEM=y CONFIG_STRIP_ASM_SYMS=y # CONFIG_STRIP is not set -# CONFIG_SUN50I_A64_CCU is not set -# CONFIG_SUN6I_A31_CCU is not set -# CONFIG_SUN8I_A23_CCU is not set -# CONFIG_SUN8I_A33_CCU is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -5053,7 +5045,6 @@ CONFIG_SUNRPC_DEBUG=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNXI_CCU is not set CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE3_WMI=m CONFIG_SURFACE_PRO3_BUTTON=m From 54c6da11c6f64c2d01382d1c2ef509ccf8c19617 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 3 Apr 2017 00:16:52 +0100 Subject: [PATCH 08/12] minor config cleanups (NFC) --- baseconfig/CONFIG_DRM_MALI_DISPLAY | 1 - baseconfig/arm/CONFIG_DRM_VMWGFX | 1 - baseconfig/{ => x86}/CONFIG_DRM_I810 | 0 baseconfig/{ => x86}/CONFIG_DRM_I915 | 0 .../{ => x86}/CONFIG_DRM_I915_ALPHA_SUPPORT | 0 .../{ => x86}/CONFIG_DRM_I915_CAPTURE_ERROR | 0 .../{ => x86}/CONFIG_DRM_I915_COMPRESS_ERROR | 0 baseconfig/{ => x86}/CONFIG_DRM_I915_GVT | 0 baseconfig/{ => x86}/CONFIG_DRM_I915_GVT_KVMGT | 0 baseconfig/{ => x86}/CONFIG_DRM_I915_USERPTR | 0 baseconfig/{ => x86}/CONFIG_DRM_VMWGFX | 0 baseconfig/{ => x86}/CONFIG_DRM_VMWGFX_FBCON | 0 baseconfig/{ => x86}/CONFIG_IB700_WDT | 0 baseconfig/{ => x86}/CONFIG_IBMASR | 0 baseconfig/{ => x86}/CONFIG_INTEL_MENLOW | 0 baseconfig/{ => x86}/CONFIG_VMWARE_BALLOON | 0 baseconfig/{ => x86}/CONFIG_VMWARE_PVSCSI | 0 kernel-aarch64-debug.config | 15 --------------- kernel-aarch64.config | 15 --------------- kernel-armv7hl-debug.config | 15 --------------- kernel-armv7hl-lpae-debug.config | 15 --------------- kernel-armv7hl-lpae.config | 15 --------------- kernel-armv7hl.config | 15 --------------- kernel-i686-PAE.config | 1 - kernel-i686-PAEdebug.config | 1 - kernel-i686-debug.config | 1 - kernel-i686.config | 1 - kernel-ppc64-debug.config | 16 ---------------- kernel-ppc64.config | 16 ---------------- kernel-ppc64le-debug.config | 16 ---------------- kernel-ppc64le.config | 16 ---------------- kernel-ppc64p7-debug.config | 16 ---------------- kernel-ppc64p7.config | 16 ---------------- kernel-s390x-debug.config | 16 ---------------- kernel-s390x.config | 16 ---------------- kernel-x86_64-debug.config | 1 - kernel-x86_64.config | 1 - 37 files changed, 226 deletions(-) delete mode 100644 baseconfig/CONFIG_DRM_MALI_DISPLAY delete mode 100644 baseconfig/arm/CONFIG_DRM_VMWGFX rename baseconfig/{ => x86}/CONFIG_DRM_I810 (100%) rename baseconfig/{ => x86}/CONFIG_DRM_I915 (100%) rename baseconfig/{ => x86}/CONFIG_DRM_I915_ALPHA_SUPPORT (100%) rename baseconfig/{ => x86}/CONFIG_DRM_I915_CAPTURE_ERROR (100%) rename baseconfig/{ => x86}/CONFIG_DRM_I915_COMPRESS_ERROR (100%) rename baseconfig/{ => x86}/CONFIG_DRM_I915_GVT (100%) rename baseconfig/{ => x86}/CONFIG_DRM_I915_GVT_KVMGT (100%) rename baseconfig/{ => x86}/CONFIG_DRM_I915_USERPTR (100%) rename baseconfig/{ => x86}/CONFIG_DRM_VMWGFX (100%) rename baseconfig/{ => x86}/CONFIG_DRM_VMWGFX_FBCON (100%) rename baseconfig/{ => x86}/CONFIG_IB700_WDT (100%) rename baseconfig/{ => x86}/CONFIG_IBMASR (100%) rename baseconfig/{ => x86}/CONFIG_INTEL_MENLOW (100%) rename baseconfig/{ => x86}/CONFIG_VMWARE_BALLOON (100%) rename baseconfig/{ => x86}/CONFIG_VMWARE_PVSCSI (100%) diff --git a/baseconfig/CONFIG_DRM_MALI_DISPLAY b/baseconfig/CONFIG_DRM_MALI_DISPLAY deleted file mode 100644 index af3d09fbe..000000000 --- a/baseconfig/CONFIG_DRM_MALI_DISPLAY +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DRM_MALI_DISPLAY is not set diff --git a/baseconfig/arm/CONFIG_DRM_VMWGFX b/baseconfig/arm/CONFIG_DRM_VMWGFX deleted file mode 100644 index 4e22be4d9..000000000 --- a/baseconfig/arm/CONFIG_DRM_VMWGFX +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DRM_VMWGFX is not set diff --git a/baseconfig/CONFIG_DRM_I810 b/baseconfig/x86/CONFIG_DRM_I810 similarity index 100% rename from baseconfig/CONFIG_DRM_I810 rename to baseconfig/x86/CONFIG_DRM_I810 diff --git a/baseconfig/CONFIG_DRM_I915 b/baseconfig/x86/CONFIG_DRM_I915 similarity index 100% rename from baseconfig/CONFIG_DRM_I915 rename to baseconfig/x86/CONFIG_DRM_I915 diff --git a/baseconfig/CONFIG_DRM_I915_ALPHA_SUPPORT b/baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT similarity index 100% rename from baseconfig/CONFIG_DRM_I915_ALPHA_SUPPORT rename to baseconfig/x86/CONFIG_DRM_I915_ALPHA_SUPPORT diff --git a/baseconfig/CONFIG_DRM_I915_CAPTURE_ERROR b/baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR similarity index 100% rename from baseconfig/CONFIG_DRM_I915_CAPTURE_ERROR rename to baseconfig/x86/CONFIG_DRM_I915_CAPTURE_ERROR diff --git a/baseconfig/CONFIG_DRM_I915_COMPRESS_ERROR b/baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR similarity index 100% rename from baseconfig/CONFIG_DRM_I915_COMPRESS_ERROR rename to baseconfig/x86/CONFIG_DRM_I915_COMPRESS_ERROR diff --git a/baseconfig/CONFIG_DRM_I915_GVT b/baseconfig/x86/CONFIG_DRM_I915_GVT similarity index 100% rename from baseconfig/CONFIG_DRM_I915_GVT rename to baseconfig/x86/CONFIG_DRM_I915_GVT diff --git a/baseconfig/CONFIG_DRM_I915_GVT_KVMGT b/baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT similarity index 100% rename from baseconfig/CONFIG_DRM_I915_GVT_KVMGT rename to baseconfig/x86/CONFIG_DRM_I915_GVT_KVMGT diff --git a/baseconfig/CONFIG_DRM_I915_USERPTR b/baseconfig/x86/CONFIG_DRM_I915_USERPTR similarity index 100% rename from baseconfig/CONFIG_DRM_I915_USERPTR rename to baseconfig/x86/CONFIG_DRM_I915_USERPTR diff --git a/baseconfig/CONFIG_DRM_VMWGFX b/baseconfig/x86/CONFIG_DRM_VMWGFX similarity index 100% rename from baseconfig/CONFIG_DRM_VMWGFX rename to baseconfig/x86/CONFIG_DRM_VMWGFX diff --git a/baseconfig/CONFIG_DRM_VMWGFX_FBCON b/baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON similarity index 100% rename from baseconfig/CONFIG_DRM_VMWGFX_FBCON rename to baseconfig/x86/CONFIG_DRM_VMWGFX_FBCON diff --git a/baseconfig/CONFIG_IB700_WDT b/baseconfig/x86/CONFIG_IB700_WDT similarity index 100% rename from baseconfig/CONFIG_IB700_WDT rename to baseconfig/x86/CONFIG_IB700_WDT diff --git a/baseconfig/CONFIG_IBMASR b/baseconfig/x86/CONFIG_IBMASR similarity index 100% rename from baseconfig/CONFIG_IBMASR rename to baseconfig/x86/CONFIG_IBMASR diff --git a/baseconfig/CONFIG_INTEL_MENLOW b/baseconfig/x86/CONFIG_INTEL_MENLOW similarity index 100% rename from baseconfig/CONFIG_INTEL_MENLOW rename to baseconfig/x86/CONFIG_INTEL_MENLOW diff --git a/baseconfig/CONFIG_VMWARE_BALLOON b/baseconfig/x86/CONFIG_VMWARE_BALLOON similarity index 100% rename from baseconfig/CONFIG_VMWARE_BALLOON rename to baseconfig/x86/CONFIG_VMWARE_BALLOON diff --git a/baseconfig/CONFIG_VMWARE_PVSCSI b/baseconfig/x86/CONFIG_VMWARE_PVSCSI similarity index 100% rename from baseconfig/CONFIG_VMWARE_PVSCSI rename to baseconfig/x86/CONFIG_VMWARE_PVSCSI diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 326dff36e..42967737a 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -1235,14 +1235,6 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m @@ -1289,8 +1281,6 @@ CONFIG_DRM_VC4=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -# CONFIG_DRM_VMWGFX is not set # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -2009,8 +1999,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_ICPLUS_PHY=m # CONFIG_ICS932S401 is not set # CONFIG_IDE is not set @@ -2187,7 +2175,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -6099,8 +6086,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 5ef00d93a..86cb4c02c 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -1225,14 +1225,6 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m @@ -1279,8 +1271,6 @@ CONFIG_DRM_VC4=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -# CONFIG_DRM_VMWGFX is not set # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1992,8 +1982,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_ICPLUS_PHY=m # CONFIG_ICS932S401 is not set # CONFIG_IDE is not set @@ -2170,7 +2158,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -6076,8 +6063,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 212fd1cb3..7a60d3d39 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1332,14 +1332,6 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y CONFIG_DRM_IMX_HDMI=m CONFIG_DRM_IMX_IPUV3=m CONFIG_DRM_IMX_LDB=m @@ -1412,8 +1404,6 @@ CONFIG_DRM_VC4=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -# CONFIG_DRM_VMWGFX is not set # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -2165,8 +2155,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_ICPLUS_PHY=m # CONFIG_ICS932S401 is not set # CONFIG_IDE is not set @@ -2361,7 +2349,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -6707,8 +6694,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 96803968f..61875ddcb 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1280,14 +1280,6 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_IMX is not set # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y @@ -1335,8 +1327,6 @@ CONFIG_DRM_VC4=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -# CONFIG_DRM_VMWGFX is not set # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -2063,8 +2053,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_ICPLUS_PHY=m # CONFIG_ICS932S401 is not set # CONFIG_IDE is not set @@ -2244,7 +2232,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -6282,8 +6269,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index e1bee0da3..7c84a17e6 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1270,14 +1270,6 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_IMX is not set # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y @@ -1325,8 +1317,6 @@ CONFIG_DRM_VC4=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -# CONFIG_DRM_VMWGFX is not set # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -2046,8 +2036,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_ICPLUS_PHY=m # CONFIG_ICS932S401 is not set # CONFIG_IDE is not set @@ -2227,7 +2215,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -6259,8 +6246,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index e7d7586d1..5aa8b2698 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1322,14 +1322,6 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y CONFIG_DRM_IMX_HDMI=m CONFIG_DRM_IMX_IPUV3=m CONFIG_DRM_IMX_LDB=m @@ -1402,8 +1394,6 @@ CONFIG_DRM_VC4=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -# CONFIG_DRM_VMWGFX is not set # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -2148,8 +2138,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_ICPLUS_PHY=m # CONFIG_ICS932S401 is not set # CONFIG_IDE is not set @@ -2344,7 +2332,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -6684,8 +6671,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index f8eca8a22..1737ce557 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1118,7 +1118,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 050de6842..6c49be27d 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -1129,7 +1129,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index c73211bac..d65d9d64b 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1129,7 +1129,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m diff --git a/kernel-i686.config b/kernel-i686.config index 04852c4be..9e63782d5 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1118,7 +1118,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 2a6cec8c4..d7b42b3f4 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -1082,18 +1082,9 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m @@ -1121,8 +1112,6 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1817,8 +1806,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_IBM_BSR=m CONFIG_IBMEBUS=y # CONFIG_IBM_EMAC is not set @@ -1999,7 +1986,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -5593,8 +5579,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index b98c1e749..f5a331aad 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -1071,18 +1071,9 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m @@ -1110,8 +1101,6 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1799,8 +1788,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_IBM_BSR=m CONFIG_IBMEBUS=y # CONFIG_IBM_EMAC is not set @@ -1981,7 +1968,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -5569,8 +5555,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index b09390184..20d6620bc 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1038,18 +1038,9 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m @@ -1077,8 +1068,6 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1769,8 +1758,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_IBM_BSR=m CONFIG_IBMEBUS=y # CONFIG_IBM_EMAC is not set @@ -1945,7 +1932,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -5522,8 +5508,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 0a00d0798..ccd4e4328 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1027,18 +1027,9 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m @@ -1066,8 +1057,6 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1751,8 +1740,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_IBM_BSR=m CONFIG_IBMEBUS=y # CONFIG_IBM_EMAC is not set @@ -1927,7 +1914,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -5498,8 +5484,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 8eac87e07..b8fba01fb 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -1037,18 +1037,9 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m @@ -1076,8 +1067,6 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1768,8 +1757,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_IBM_BSR=m CONFIG_IBMEBUS=y # CONFIG_IBM_EMAC is not set @@ -1944,7 +1931,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -5521,8 +5507,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 0a26a33d8..71d2d249e 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -1026,18 +1026,9 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m @@ -1065,8 +1056,6 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1750,8 +1739,6 @@ CONFIG_I40EVF=m CONFIG_I6300ESB_WDT=m CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_IBM_BSR=m CONFIG_IBMEBUS=y # CONFIG_IBM_EMAC is not set @@ -1926,7 +1913,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -5497,8 +5483,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m # CONFIG_VME_BUS is not set -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 1e8740466..aa07540fe 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1033,18 +1033,9 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM is not set # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m @@ -1072,8 +1063,6 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1722,8 +1711,6 @@ CONFIG_I40EVF=m # CONFIG_I6300ESB_WDT is not set CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_IBM_PARTITION=y CONFIG_ICPLUS_PHY=m # CONFIG_ICS932S401 is not set @@ -1893,7 +1880,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -5411,8 +5397,6 @@ CONFIG_VLSI_FIR=m CONFIG_VMCP=y # CONFIG_VME_BUS is not set CONFIG_VMLOGRDR=m -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 639889b55..41aec9bdd 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1022,18 +1022,9 @@ CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_I2C_SIL164=m -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I915_ALPHA_SUPPORT is not set -CONFIG_DRM_I915_CAPTURE_ERROR=y -CONFIG_DRM_I915_COMPRESS_ERROR=y -CONFIG_DRM_I915_GVT_KVMGT=m -CONFIG_DRM_I915_GVT=y -CONFIG_DRM_I915=m -CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM is not set # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m @@ -1061,8 +1052,6 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VGEM=m CONFIG_DRM_VIA=m CONFIG_DRM_VIRTIO_GPU=m -CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m # CONFIG_DS1682 is not set # CONFIG_DS1803 is not set # CONFIG_DT3155 is not set @@ -1704,8 +1693,6 @@ CONFIG_I40EVF=m # CONFIG_I6300ESB_WDT is not set CONFIG_I82092=m # CONFIG_IAQCORE is not set -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m CONFIG_IBM_PARTITION=y CONFIG_ICPLUS_PHY=m # CONFIG_ICS932S401 is not set @@ -1875,7 +1862,6 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INTEGRITY is not set # CONFIG_INTEL_IDMA64 is not set -# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_XWAY_PHY=m @@ -5387,8 +5373,6 @@ CONFIG_VLSI_FIR=m CONFIG_VMCP=y # CONFIG_VME_BUS is not set CONFIG_VMLOGRDR=m -CONFIG_VMWARE_BALLOON=m -CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m CONFIG_VSOCKETS=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 2488ea90a..8608267ba 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1161,7 +1161,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index d70b202f0..a4dafb582 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1150,7 +1150,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM=m -# CONFIG_DRM_MALI_DISPLAY is not set CONFIG_DRM_MGAG200=m # CONFIG_DRM_MGA is not set CONFIG_DRM_MXSFB=m From 8b869ca45ca13609d79afaa242151e46c280cad2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 3 Apr 2017 09:06:10 +0100 Subject: [PATCH 09/12] fix changelog date... fool me! --- kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index ca2138c75..195755301 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2169,7 +2169,7 @@ fi # # %changelog -* Sun Apr 1 2017 Peter Robinson +* Sun Apr 2 2017 Peter Robinson - Enable STi DRM driver * Thu Mar 30 2017 Laura Abbott - 4.11.0-0.rc4.git3.1 From aa80d89f72257323cae01a11b05f3053d35270b3 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 3 Apr 2017 08:19:17 -0700 Subject: [PATCH 10/12] Disable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 195755301..ad488f6f3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -125,7 +125,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 %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -2169,6 +2169,9 @@ fi # # %changelog +* Mon Apr 03 2017 Laura Abbott +- Disable debugging options. + * Sun Apr 2 2017 Peter Robinson - Enable STi DRM driver From ee2d654a0f9b20a2da8823d5e2fe8084cbfa0236 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 3 Apr 2017 08:22:06 -0700 Subject: [PATCH 11/12] Linux v4.11-rc5 --- kernel.spec | 7 +++++-- sources | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel.spec b/kernel.spec index ad488f6f3..5face3693 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,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 4 +%global rcrev 5 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2169,6 +2169,9 @@ fi # # %changelog +* Mon Apr 03 2017 Laura Abbott - 4.11.0-0.rc5.git0.1 +- Linux v4.11-rc5 + * Mon Apr 03 2017 Laura Abbott - Disable debugging options. diff --git a/sources b/sources index 7d35ffe36..a88bbc534 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 -SHA512 (patch-4.11-rc4.xz) = d92866ffe4997a5e489c034fc1c378d7e588f76cfa18d642854ce0bf412cdbc82d8e850d6665fa5175084ec0b7662b0f53435231d2b46b13cefbb9ba63f73791 -SHA512 (patch-4.11-rc4-git3.xz) = 7d2e643cae2083bf012ff164930ded87787fe8d3e111a2a63db3ee4b1f6c2539cd03f2a4c75a46c5b4472d8cc7c77a0f122bb340b5fcf192e55ed881ba2f94d1 +SHA512 (patch-4.11-rc5.xz) = 9b8b728eb8bb679d012c90f878739f02a3c9d13eb916248550fc61fad5a7ac5a0aee9c8166ff0c8b3180b96679f69ffbb5f79992f02a1693fd2c3616df1f6dd1 From a849475f74fba189a9097211761507e790260a12 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 3 Apr 2017 08:42:59 -0700 Subject: [PATCH 12/12] Disable 64K pages on aarch64 --- baseconfig/arm/CONFIG_MESON_SM | 2 +- baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES | 1 + baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES | 1 - baseconfig/arm/arm64/CONFIG_COMPAT | 1 + kernel-aarch64-debug.config | 5 +++-- kernel-aarch64.config | 5 +++-- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel.spec | 1 + 11 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES delete mode 100644 baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES create mode 100644 baseconfig/arm/arm64/CONFIG_COMPAT diff --git a/baseconfig/arm/CONFIG_MESON_SM b/baseconfig/arm/CONFIG_MESON_SM index 3cd5a9e30..e918e3e03 100644 --- a/baseconfig/arm/CONFIG_MESON_SM +++ b/baseconfig/arm/CONFIG_MESON_SM @@ -1 +1 @@ -CONFIG_MESON_SM=y +# CONFIG_MESON_SM is not set diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES b/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES new file mode 100644 index 000000000..5df91df1a --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES b/baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES deleted file mode 100644 index bda5426de..000000000 --- a/baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES +++ /dev/null @@ -1 +0,0 @@ -CONFIG_ARM64_64K_PAGES=y diff --git a/baseconfig/arm/arm64/CONFIG_COMPAT b/baseconfig/arm/arm64/CONFIG_COMPAT new file mode 100644 index 000000000..3e041f1b6 --- /dev/null +++ b/baseconfig/arm/arm64/CONFIG_COMPAT @@ -0,0 +1 @@ +# CONFIG_COMPAT is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 42967737a..2e45e76d7 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -237,7 +237,7 @@ CONFIG_ARCH_XGENE=y # CONFIG_ARCH_ZX is not set # CONFIG_ARCH_ZYNQMP is not set # CONFIG_ARCNET is not set -CONFIG_ARM64_64K_PAGES=y +CONFIG_ARM64_4K_PAGES=y CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y CONFIG_ARM64_CRYPTO=y CONFIG_ARM64_ERRATUM_819472=y @@ -879,6 +879,7 @@ CONFIG_COMMON_CLK=y CONFIG_COMMON_RESET_HI6220=m CONFIG_COMPACTION=y # CONFIG_COMPAT_BRK is not set +# CONFIG_COMPAT is not set # CONFIG_COMPILE_TEST is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y @@ -2831,7 +2832,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MESON_EFUSE=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_GXL_PHY=m -CONFIG_MESON_SM=y +# CONFIG_MESON_SM is not set # CONFIG_MESON_WATCHDOG is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 86cb4c02c..12f1fb7cd 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -237,7 +237,7 @@ CONFIG_ARCH_XGENE=y # CONFIG_ARCH_ZX is not set # CONFIG_ARCH_ZYNQMP is not set # CONFIG_ARCNET is not set -CONFIG_ARM64_64K_PAGES=y +CONFIG_ARM64_4K_PAGES=y CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y CONFIG_ARM64_CRYPTO=y CONFIG_ARM64_ERRATUM_819472=y @@ -879,6 +879,7 @@ CONFIG_COMMON_CLK=y CONFIG_COMMON_RESET_HI6220=m CONFIG_COMPACTION=y # CONFIG_COMPAT_BRK is not set +# CONFIG_COMPAT is not set # CONFIG_COMPILE_TEST is not set CONFIG_CONFIGFS_FS=y CONFIG_CONNECTOR=y @@ -2811,7 +2812,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MESON_EFUSE=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_GXL_PHY=m -CONFIG_MESON_SM=y +# CONFIG_MESON_SM is not set # CONFIG_MESON_WATCHDOG is not set CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 7a60d3d39..2651a8b9a 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3049,7 +3049,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MESON_EFUSE=m # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set -CONFIG_MESON_SM=y +# CONFIG_MESON_SM is not set CONFIG_MESON_WATCHDOG=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 CONFIG_MFD_88PM800=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 61875ddcb..53591551c 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2916,7 +2916,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MESON_EFUSE=m # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set -CONFIG_MESON_SM=y +# CONFIG_MESON_SM is not set CONFIG_MESON_WATCHDOG=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 7c84a17e6..6db332c31 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2896,7 +2896,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MESON_EFUSE=m # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set -CONFIG_MESON_SM=y +# CONFIG_MESON_SM is not set CONFIG_MESON_WATCHDOG=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM800 is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 5aa8b2698..69d2e09d6 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3029,7 +3029,7 @@ CONFIG_MEMSTICK_TIFM_MS=m CONFIG_MESON_EFUSE=m # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set -CONFIG_MESON_SM=y +# CONFIG_MESON_SM is not set CONFIG_MESON_WATCHDOG=m CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 CONFIG_MFD_88PM800=m diff --git a/kernel.spec b/kernel.spec index 5face3693..458784fb6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2171,6 +2171,7 @@ fi %changelog * Mon Apr 03 2017 Laura Abbott - 4.11.0-0.rc5.git0.1 - Linux v4.11-rc5 +- Disable 64K pages on aarch64 * Mon Apr 03 2017 Laura Abbott - Disable debugging options.