summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--baseconfig/CONFIG_IPV6_GRE2
-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.spec7
-rw-r--r--sources1
24 files changed, 28 insertions, 24 deletions
diff --git a/baseconfig/CONFIG_IPV6_GRE b/baseconfig/CONFIG_IPV6_GRE
index e09c2945a..d182bc161 100644
--- a/baseconfig/CONFIG_IPV6_GRE
+++ b/baseconfig/CONFIG_IPV6_GRE
@@ -1 +1 @@
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
diff --git a/gitrev b/gitrev
index 0424437dd..3dc8b1d59 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-49def1853334396f948dcb4cedb9347abb318df5
+4b19a9e20bf99d62e1c47554f8eb2d9f520642ba
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 0aac359af..6f159134d 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2290,7 +2290,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index a4f2fa5c6..134cf0d3e 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2273,7 +2273,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index ecf4c160b..8c5698530 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2469,7 +2469,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 46bc4cf24..aa4dc34af 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2358,7 +2358,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 7abbd9af2..f0b7c7485 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2342,7 +2342,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index bf2b2ad70..e63c66081 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2453,7 +2453,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 5a3efa25e..4c38676a0 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2202,7 +2202,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 2a315af9b..97420ae14 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2219,7 +2219,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 93c8deaf3..ea0cca961 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2219,7 +2219,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 209050f06..0831ed641 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2202,7 +2202,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 925841147..b7735db11 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2118,7 +2118,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 4fdd77aad..a691d0838 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2101,7 +2101,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 9d8019bce..fcfa47306 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2064,7 +2064,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index a260cf6ee..50bb94a74 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2047,7 +2047,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 7c4290b2c..abb0bc7e8 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -2063,7 +2063,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 94b75be1e..9b24abb1b 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -2046,7 +2046,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 9cae5b0bf..54561e4a7 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2014,7 +2014,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index ec0f67b53..08d9cc5fa 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1997,7 +1997,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 9ca124896..9ce86af2f 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2254,7 +2254,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 6f8c127b4..04ee06380 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2237,7 +2237,7 @@ CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_LIST_SET=m
CONFIG_IP_SET=m
CONFIG_IP_SET_MAX=256
-# CONFIG_IPV6_GRE is not set
+CONFIG_IPV6_GRE=m
CONFIG_IPV6_ILA=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
diff --git a/kernel.spec b/kernel.spec
index 22ef73f9d..b8675b827 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 3
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -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
@@ -2152,6 +2152,9 @@ fi
#
#
%changelog
+* Tue Jan 17 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc4.git1.1
+- Linux v4.10-rc4-78-g4b19a9e
+
* Tue Jan 17 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc4.git0.3
- Reenable debugging options.
diff --git a/sources b/sources
index d4973a26b..4fc633b33 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
SHA512 (linux-4.9.tar.xz) = bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
SHA512 (perf-man-4.9.tar.gz) = d23bb3da1eadd6623fddbf4696948de7675f3dcf57c711a7427dd7ae111394f58d8f42752938bbea7cd219f1e7f6f116fc67a1c74f769711063940a065f37b99
SHA512 (patch-4.10-rc4.xz) = 89d903d52ff907f3911ac09214d1299c310fd67b7ff36170c6233e6348049fb0f669ba245a8ca310f52c91eb523aa5f91a9b52f4c67ca932b951fe2c60f25ae5
+SHA512 (patch-4.10-rc4-git1.xz) = 619d286b7d49d4c65e53d5d3c3f7c6370a884837c668417b7edb8a8089aad32d74477eee4c4bbd0b084340f6c650ed48772e727740cf15a9a630523b2fcaa36e
generated by cgit (git 2.34.1) at 2024-06-30 09:19:50 +0000