summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch36
-rw-r--r--baseconfig/CONFIG_CGROUP_RDMA1
-rw-r--r--baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I2
-rw-r--r--baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I2
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config3
-rw-r--r--kernel-aarch64.config3
-rw-r--r--kernel-armv7hl-debug.config3
-rw-r--r--kernel-armv7hl-lpae-debug.config3
-rw-r--r--kernel-armv7hl-lpae.config3
-rw-r--r--kernel-armv7hl.config3
-rw-r--r--kernel-i686-PAE.config1
-rw-r--r--kernel-i686-PAEdebug.config1
-rw-r--r--kernel-i686-debug.config1
-rw-r--r--kernel-i686.config1
-rw-r--r--kernel-ppc64-debug.config1
-rw-r--r--kernel-ppc64.config1
-rw-r--r--kernel-ppc64le-debug.config1
-rw-r--r--kernel-ppc64le.config1
-rw-r--r--kernel-ppc64p7-debug.config1
-rw-r--r--kernel-ppc64p7.config1
-rw-r--r--kernel-s390x-debug.config1
-rw-r--r--kernel-s390x.config1
-rw-r--r--kernel-x86_64-debug.config1
-rw-r--r--kernel-x86_64.config1
-rw-r--r--kernel.spec8
-rw-r--r--sources2
27 files changed, 35 insertions, 50 deletions
diff --git a/0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch b/0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch
deleted file mode 100644
index fe873432b..000000000
--- a/0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From af8071ce3168509e372a2c6108bc0c758f79e49c Mon Sep 17 00:00:00 2001
-From: Dave Jiang <dave.jiang@intel.com>
-Date: Mon, 27 Feb 2017 14:44:40 -0700
-Subject: [PATCH] mm, x86: fix HIGHMEM64 && PARAVIRT build config for
- native_pud_clear()
-
-Looks like I also missed the build config that includes
-CONFIG_HIGHMEM64G && CONFIG_PARAVIRT to export the native_pud_clear()
-dummy function.
-
-Fix: commit e5d56efc ("mm,x86: fix SMP x86 32bit build for native_pud_clear()")
-
-Reported-by: Laura Abbott <labbott@redhat.com>
-Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
-Signed-off-by: Dave Jiang <dave.jiang@intel.com>
----
- arch/x86/include/asm/pgtable-3level.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
-index 8f50fb3..72277b1 100644
---- a/arch/x86/include/asm/pgtable-3level.h
-+++ b/arch/x86/include/asm/pgtable-3level.h
-@@ -121,7 +121,8 @@ static inline void native_pmd_clear(pmd_t *pmd)
- *(tmp + 1) = 0;
- }
-
--#ifndef CONFIG_SMP
-+#if !defined(CONFIG_SMP) || (defined(CONFIG_HIGHMEM64G) && \
-+ defined(CONFIG_PARAVIRT))
- static inline void native_pud_clear(pud_t *pudp)
- {
- }
---
-2.7.4
-
diff --git a/baseconfig/CONFIG_CGROUP_RDMA b/baseconfig/CONFIG_CGROUP_RDMA
new file mode 100644
index 000000000..94ae4f4bc
--- /dev/null
+++ b/baseconfig/CONFIG_CGROUP_RDMA
@@ -0,0 +1 @@
+# CONFIG_CGROUP_RDMA is not set
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
index e47c19e7e..7c9597c70 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
+++ b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
@@ -1 +1 @@
-CONFIG_RTC_DRV_SUN6I=m
+# CONFIG_RTC_DRV_SUN6I is not set
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
index e47c19e7e..7c9597c70 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
+++ b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
@@ -1 +1 @@
-CONFIG_RTC_DRV_SUN6I=m
+# CONFIG_RTC_DRV_SUN6I is not set
diff --git a/gitrev b/gitrev
index 1681afa85..0cc79649b 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-e5d56efc97f8240d0b5d66c03949382b6d7e5570
+86292b33d4b79ee03e2f43ea0381ef85f077c760
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 5f4fe0d1c..c5c5acc41 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -774,6 +774,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
@@ -4402,7 +4403,7 @@ CONFIG_RTC_DRV_S35390A=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+# CONFIG_RTC_DRV_SUN6I is not set
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 98f2b883c..61be13ca2 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -774,6 +774,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
@@ -4380,7 +4381,7 @@ CONFIG_RTC_DRV_S35390A=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+# CONFIG_RTC_DRV_SUN6I is not set
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 053d257f4..941800e07 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -821,6 +821,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
CONFIG_CHARGER_BQ2415X=m
@@ -4773,7 +4774,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
CONFIG_RTC_DRV_SNVS=m
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+# CONFIG_RTC_DRV_SUN6I is not set
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 0c4f1dfb7..fd86adba9 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -801,6 +801,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
CONFIG_CHARGER_BQ2415X=m
@@ -4510,7 +4511,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+# CONFIG_RTC_DRV_SUN6I is not set
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index fa078e2ad..d2f9b996e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -801,6 +801,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
CONFIG_CHARGER_BQ2415X=m
@@ -4489,7 +4490,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+# CONFIG_RTC_DRV_SUN6I is not set
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 98dd36a38..36df8ef74 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -821,6 +821,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
CONFIG_CHARGER_BQ2415X=m
@@ -4752,7 +4753,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
CONFIG_RTC_DRV_SNVS=m
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+# CONFIG_RTC_DRV_SUN6I is not set
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index a7fa56f4a..c711edcf5 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -681,6 +681,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 00c305ec8..1e830d735 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -681,6 +681,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index d6b7fdcbb..48af52c37 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -681,6 +681,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 089c4498c..99dfad75f 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -681,6 +681,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index ca5e0e717..52ed1e89a 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -677,6 +677,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index a1544a468..fa8e2fed4 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -677,6 +677,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 31fd193cd..b7d4cb25c 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -634,6 +634,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 69392a01f..943fae5a1 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -634,6 +634,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 0660a8ee5..b8aff5493 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -634,6 +634,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index bc5dad0ae..c25ff593d 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -634,6 +634,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 2efd2ce83..deed80e09 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -633,6 +633,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index f801f05fa..53f482226 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -633,6 +633,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 2f7a61195..99af1f159 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -685,6 +685,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 115597231..c070ded10 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -685,6 +685,7 @@ CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_PIDS=y
+# CONFIG_CGROUP_RDMA is not set
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUPS=y
# CONFIG_CHARGER_BQ2415X is not set
diff --git a/kernel.spec b/kernel.spec
index 56d5efc7d..b4d155a1a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 5
+%define gitrev 6
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -589,9 +589,6 @@ Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
# Still other instances of this bug floating around
Patch853: 0001-Work-around-for-gcc7-and-arm64.patch
-# compile error
-Patch854: 0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -2161,6 +2158,9 @@ fi
#
#
%changelog
+* Tue Feb 28 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git6.1
+- Linux v4.10-10531-g86292b3
+
* Tue Feb 28 2017 Justin M. Forbes <jforbes@fedoraproject.org>
- Fix kernel-devel virtual provide
diff --git a/sources b/sources
index 65071ad0b..90704ab7c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
-SHA512 (patch-4.10-git5.xz) = 3d6436542c6556111466d6c43c38f52c8c7e898988aaedb4348fee30dd6f4e8d451b8ad7e0f5feafec6b08fa57d45e0b2038237a82e82483ef77aecbb71da30f
+SHA512 (patch-4.10-git6.xz) = 66803a6214e6f09379e82be51a3c1ef771e7357efb44fdbd4b77cf5654adc4b12efd3f7d97ecddc3c6ae4886118cb3d064dabb2637f2b7e648898d79671683c8