summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-08-21 18:59:22 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2017-08-21 18:59:22 +0200
commit6cd693eb065d7229d5f2ff9986803224c7e52e1e (patch)
treeb9593c673c839c8475379a8c770d313440b7822f
parent02ee821c2a5f6ea79553c3ffbf66919ff72298a1 (diff)
parent19f2b71f7f1a81cf140c50650bb83e33a0019f77 (diff)
downloadkernel-6cd693eb065d7229d5f2ff9986803224c7e52e1e.tar.gz
kernel-6cd693eb065d7229d5f2ff9986803224c7e52e1e.tar.xz
kernel-6cd693eb065d7229d5f2ff9986803224c7e52e1e.zip
-rw-r--r--0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch73
-rw-r--r--baseconfig/CONFIG_GPIO_IT872
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64-debug.config2
-rw-r--r--kernel-ppc64.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-ppc64p7-debug.config2
-rw-r--r--kernel-ppc64p7.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
-rw-r--r--kernel.spec11
-rw-r--r--sources3
25 files changed, 29 insertions, 102 deletions
diff --git a/0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch b/0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch
deleted file mode 100644
index d3b025547..000000000
--- a/0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From caa7919d0402b9ebe40ac3f5228c31e28a933327 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Wed, 16 Aug 2017 14:56:31 -0700
-Subject: [PATCH] mm/vmalloc: Don't unconditonally use __GFP_HIGHMEM
-To: Andrew Morton <akpm@linux-foundation.org>
-To: Michal Hocko <mhocko@suse.com>
-To: Vlastimil Babka <vbabka@suse.cz>
-To: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
-Cc: linux-mm@kvack.org
-Cc: linux-kernel@vger.kernel.org
-
-Commit 19809c2da28a ("mm, vmalloc: use __GFP_HIGHMEM implicitly")
-added use of __GFP_HIGHMEM for allocations. vmalloc_32 may use
-GFP_DMA/GFP_DMA32 which does not play nice with __GFP_HIGHMEM
-and will drigger a BUG in gfp_zone. Only add __GFP_HIGHMEM if
-we aren't using GFP_DMA/GFP_DMA32.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1482249
-Fixes: 19809c2da28a ("mm, vmalloc: use __GFP_HIGHMEM implicitly")
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- mm/vmalloc.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index 8698c1c86c4d..a47e3894c775 100644
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1671,7 +1671,10 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
- struct page **pages;
- unsigned int nr_pages, array_size, i;
- const gfp_t nested_gfp = (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO;
-- const gfp_t alloc_mask = gfp_mask | __GFP_HIGHMEM | __GFP_NOWARN;
-+ const gfp_t alloc_mask = gfp_mask | __GFP_NOWARN;
-+ const gfp_t highmem_mask = (gfp_mask & (GFP_DMA | GFP_DMA32)) ?
-+ 0 :
-+ __GFP_HIGHMEM;
-
- nr_pages = get_vm_area_size(area) >> PAGE_SHIFT;
- array_size = (nr_pages * sizeof(struct page *));
-@@ -1679,7 +1682,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
- area->nr_pages = nr_pages;
- /* Please note that the recursion is strictly bounded. */
- if (array_size > PAGE_SIZE) {
-- pages = __vmalloc_node(array_size, 1, nested_gfp|__GFP_HIGHMEM,
-+ pages = __vmalloc_node(array_size, 1, nested_gfp|highmem_mask,
- PAGE_KERNEL, node, area->caller);
- } else {
- pages = kmalloc_node(array_size, nested_gfp, node);
-@@ -1700,9 +1703,9 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
- }
-
- if (node == NUMA_NO_NODE)
-- page = alloc_page(alloc_mask);
-+ page = alloc_page(alloc_mask|highmem_mask);
- else
-- page = alloc_pages_node(node, alloc_mask, 0);
-+ page = alloc_pages_node(node, alloc_mask|highmem_mask, 0);
-
- if (unlikely(!page)) {
- /* Successfully allocated i pages, free them in __vunmap() */
-@@ -1710,7 +1713,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
- goto fail;
- }
- area->pages[i] = page;
-- if (gfpflags_allow_blocking(gfp_mask))
-+ if (gfpflags_allow_blocking(gfp_mask|highmem_mask))
- cond_resched();
- }
-
---
-2.13.0
-
diff --git a/baseconfig/CONFIG_GPIO_IT87 b/baseconfig/CONFIG_GPIO_IT87
index aaeb504ac..00746d711 100644
--- a/baseconfig/CONFIG_GPIO_IT87
+++ b/baseconfig/CONFIG_GPIO_IT87
@@ -1 +1 @@
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
diff --git a/gitrev b/gitrev
index 50986ea96..e2407ff3a 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-039a8e38473323ed9f6c4415b4c3a36777efac34
+14ccee78fc82f5512908f4424f541549a5705b89
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 525cce29d..cb02b0050 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1732,7 +1732,7 @@ CONFIG_GPIO_EXAR=m
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_GENERIC=y
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index eaf600cf9..3f229fdc4 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1715,7 +1715,7 @@ CONFIG_GPIO_EXAR=m
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_GENERIC=y
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 4bfa3935a..30c2c8bd3 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1859,7 +1859,7 @@ CONFIG_GPIO_EXAR=m
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_GENERIC=y
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
CONFIG_GPIO_MAX7301=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index da3311cdb..354c72115 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1764,7 +1764,7 @@ CONFIG_GPIO_EXAR=m
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_GENERIC=y
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
CONFIG_GPIO_MAX7301=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 80d177db7..1b7010fab 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1747,7 +1747,7 @@ CONFIG_GPIO_EXAR=m
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_GENERIC=y
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
CONFIG_GPIO_MAX7301=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 08a183a5f..cdd2037c3 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1842,7 +1842,7 @@ CONFIG_GPIO_EXAR=m
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_GENERIC=y
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
CONFIG_GPIO_MAX7301=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index cc31234c3..b7a9c232a 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1604,7 +1604,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_GRGPIO is not set
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_INTEL_MID is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_LYNXPOINT is not set
# CONFIG_GPIO_MAX7300 is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index c896b6ab1..19ce6883e 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1622,7 +1622,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_GRGPIO is not set
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_INTEL_MID is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_LYNXPOINT is not set
# CONFIG_GPIO_MAX7300 is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 8541ed4cb..b9e6a3926 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1622,7 +1622,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_GRGPIO is not set
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_INTEL_MID is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_LYNXPOINT is not set
# CONFIG_GPIO_MAX7300 is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index ced2e266a..e9c919983 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1604,7 +1604,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_GRGPIO is not set
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_INTEL_MID is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_LYNXPOINT is not set
# CONFIG_GPIO_MAX7300 is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index c17813d6b..5fa9f4f28 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1533,7 +1533,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index d368edd1f..2041e0d48 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1515,7 +1515,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index c76b90fb2..de961892a 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1487,7 +1487,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index de68e7c9d..9afd9305d 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1469,7 +1469,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 0ae90d5fe..743ed6247 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -1486,7 +1486,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 0c2a27ff0..5b41e7d85 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1468,7 +1468,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 25977b5f7..76d606eb0 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1457,7 +1457,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
# CONFIG_GPIOLIB is not set
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 7f0886fc8..d70d86ffd 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1439,7 +1439,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_FTGPIO010 is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
# CONFIG_GPIOLIB is not set
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX7301 is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 6a91c3475..52a1fdbe5 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1660,7 +1660,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_GRGPIO is not set
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_INTEL_MID is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_LYNXPOINT is not set
# CONFIG_GPIO_MAX7300 is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index e9fc3df83..08afc3a7c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1642,7 +1642,7 @@ CONFIG_GPIO_EXAR=m
# CONFIG_GPIO_GRGPIO is not set
CONFIG_GPIO_ICH=m
# CONFIG_GPIO_INTEL_MID is not set
-# CONFIG_GPIO_IT87 is not set
+CONFIG_GPIO_IT87=m
CONFIG_GPIOLIB=y
# CONFIG_GPIO_LYNXPOINT is not set
# CONFIG_GPIO_MAX7300 is not set
diff --git a/kernel.spec b/kernel.spec
index 402145805..5c8347bed 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,9 +75,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 5
+%global rcrev 6
# The git snapshot level
-%define gitrev 4
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -666,9 +666,6 @@ Patch617: Fix-for-module-sig-verification.patch
# request for bug fix
Patch618: iio-race-fix.patch
-# rhbz 1482249
-Patch619: 0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -2225,6 +2222,10 @@ fi
#
#
%changelog
+* Mon Aug 21 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.13.0-0.rc6.git0.1
+- Disable debugging options.
+- Linux v4.13-rc6
+
* Fri Aug 18 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.13.0-0.rc5.git4.1
- Linux v4.13-rc5-130-g039a8e384733
diff --git a/sources b/sources
index f9c395803..f0d3c59a4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c
SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
-SHA512 (patch-4.13-rc5.xz) = eebba5b56aa93aaea8ff450febbd13bb5ffef9a8331666dc6ac44a73b355e8ec36d9d27da1aaec07e45844669bd31e9d8fadd278aa6d04356af2aa90387d65ac
-SHA512 (patch-4.13-rc5-git4.xz) = a3ad1e99aecfa55ff9f6f9e13a39a594e3ba463c905b2682683a6a667b6c323ae668befc9d71ee21a1ecf6fe313402aa40a4ce3e2da5db5a1b3cf4e3722ee642
+SHA512 (patch-4.13-rc6.xz) = bc3dbb6c69a663614132c85cf51b0c390d6c8f6f5be4f950ee5425a16c3b929e59e98fd6bc7ea601f7b369af0e9cad4f21276a12707c6c001f500daaafb07860