diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-04 11:03:33 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-04 11:03:33 +0100 |
commit | f532038be75c4e215d5759b0cbd57c20ca5f3f20 (patch) | |
tree | 767cff52fd80fe7ef00bc25e842f7d83001d414f | |
parent | eeb02ab1254c199a785ccd8bbe350d50f12598c6 (diff) | |
parent | 69ffe69523fa331720bb430b6e02cc0ec572c72a (diff) | |
download | kernel-4.11.0-0.rc0.git9.1.vanilla.knurd.1.fc27.tar.gz kernel-4.11.0-0.rc0.git9.1.vanilla.knurd.1.fc27.tar.xz kernel-4.11.0-0.rc0.git9.1.vanilla.knurd.1.fc27.zip |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc0.git9.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc0.git9.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc0.git9.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc0.git9.1.vanilla.knurd.1.fc24
-rw-r--r-- | 0001-Work-around-for-gcc7-and-arm64.patch | 62 | ||||
-rw-r--r-- | baseconfig/CONFIG_IPVTAP | 1 | ||||
-rw-r--r-- | baseconfig/CONFIG_NET_L3_MASTER_DEV | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 3 | ||||
-rw-r--r-- | kernel-aarch64.config | 3 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 3 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 3 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 3 | ||||
-rw-r--r-- | kernel-armv7hl.config | 3 | ||||
-rw-r--r-- | kernel-i686-PAE.config | 3 | ||||
-rw-r--r-- | kernel-i686-PAEdebug.config | 3 | ||||
-rw-r--r-- | kernel-i686-debug.config | 3 | ||||
-rw-r--r-- | kernel-i686.config | 3 | ||||
-rw-r--r-- | kernel-ppc64-debug.config | 3 | ||||
-rw-r--r-- | kernel-ppc64.config | 3 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 3 | ||||
-rw-r--r-- | kernel-ppc64le.config | 3 | ||||
-rw-r--r-- | kernel-ppc64p7-debug.config | 3 | ||||
-rw-r--r-- | kernel-ppc64p7.config | 3 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 3 | ||||
-rw-r--r-- | kernel-s390x.config | 3 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 3 | ||||
-rw-r--r-- | kernel-x86_64.config | 3 | ||||
-rw-r--r-- | kernel.spec | 14 | ||||
-rw-r--r-- | sources | 2 |
26 files changed, 54 insertions, 89 deletions
diff --git a/0001-Work-around-for-gcc7-and-arm64.patch b/0001-Work-around-for-gcc7-and-arm64.patch deleted file mode 100644 index 88f40be5d..000000000 --- a/0001-Work-around-for-gcc7-and-arm64.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 975dcf140bd307b431aff7b6d671155c796cfe5e Mon Sep 17 00:00:00 2001 -From: Laura Abbott <labbott@redhat.com> -Date: Sat, 28 Jan 2017 16:13:49 +0100 -Subject: [PATCH] Work around for gcc7 and arm64 - -Originally proposed by Will Deacon <will.deacon@arm.com> - -http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/462224.html - -Signed-off-by: Laura Abbott <labbott@redhat.com> ---- - include/linux/log2.h | 13 ++----------- - 1 file changed, 2 insertions(+), 11 deletions(-) - -diff --git a/include/linux/log2.h b/include/linux/log2.h -index fd7ff3d91e6a..1ab22b79681e 100644 ---- a/include/linux/log2.h -+++ b/include/linux/log2.h -@@ -16,12 +16,6 @@ - #include <linux/bitops.h> - - /* -- * deal with unrepresentable constant logarithms -- */ --extern __attribute__((const, noreturn)) --int ____ilog2_NaN(void); -- --/* - * non-constant log of base 2 calculators - * - the arch may override these in asm/bitops.h if they can be implemented - * more efficiently than using fls() and fls64() -@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - #define ilog2(n) \ - ( \ - __builtin_constant_p(n) ? ( \ -- (n) < 1 ? ____ilog2_NaN() : \ -+ (n) < 1 ? 0 : \ - (n) & (1ULL << 63) ? 63 : \ - (n) & (1ULL << 62) ? 62 : \ - (n) & (1ULL << 61) ? 61 : \ -@@ -149,9 +143,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - (n) & (1ULL << 3) ? 3 : \ - (n) & (1ULL << 2) ? 2 : \ - (n) & (1ULL << 1) ? 1 : \ -- (n) & (1ULL << 0) ? 0 : \ -- ____ilog2_NaN() \ -- ) : \ -+ 0 ) : \ - (sizeof(n) <= 4) ? \ - __ilog2_u32(n) : \ - __ilog2_u64(n) \ -@@ -194,7 +186,6 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - * @n: parameter - * - * The first few values calculated by this routine: -- * ob2(0) = 0 - * ob2(1) = 0 - * ob2(2) = 1 - * ob2(3) = 2 --- -2.11.0 - diff --git a/baseconfig/CONFIG_IPVTAP b/baseconfig/CONFIG_IPVTAP new file mode 100644 index 000000000..4bb385673 --- /dev/null +++ b/baseconfig/CONFIG_IPVTAP @@ -0,0 +1 @@ +CONFIG_IPVTAP=m diff --git a/baseconfig/CONFIG_NET_L3_MASTER_DEV b/baseconfig/CONFIG_NET_L3_MASTER_DEV index c5825b130..bdf39009e 100644 --- a/baseconfig/CONFIG_NET_L3_MASTER_DEV +++ b/baseconfig/CONFIG_NET_L3_MASTER_DEV @@ -1 +1 @@ -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y @@ -1 +1 @@ -4977ab6e92e267afe9d8f78438c3db330ca8434c +c82be9d2244aacea9851c86f4fb74694c99cd874 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index dd11adea2..a592de789 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2348,6 +2348,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3374,7 +3375,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index be12e2d7c..f016a2d3a 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2331,6 +2331,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3353,7 +3354,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 8283a7a89..e81fd48a3 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2518,6 +2518,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3634,7 +3635,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index ac1a21e1e..47f8f4198 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2406,6 +2406,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3481,7 +3482,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 6683d8660..180df196a 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2389,6 +2389,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3460,7 +3461,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 76f3d6e24..de13839b8 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2501,6 +2501,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3613,7 +3614,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index c8dff4177..b53e98e14 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -2257,6 +2257,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3265,7 +3266,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 39b2d2112..f1efa87b8 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -2275,6 +2275,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3285,7 +3286,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 96767b822..168b2946f 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2275,6 +2275,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3285,7 +3286,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-i686.config b/kernel-i686.config index 5fedc8086..2e327eb17 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2257,6 +2257,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3265,7 +3266,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index bf752d598..2a642ec6d 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2157,6 +2157,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3136,7 +3137,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index c9e173d34..9179d39da 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2139,6 +2139,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3114,7 +3115,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 7366920b4..430972dfa 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2103,6 +2103,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3081,7 +3082,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 957131710..ea1339635 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2085,6 +2085,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3059,7 +3060,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 2df1d3c19..f9f4bd40e 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -2102,6 +2102,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3080,7 +3081,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index f2a20c620..290075ce2 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -2084,6 +2084,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3058,7 +3059,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 2c5dc1ef3..a8b5f928b 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2054,6 +2054,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -3014,7 +3015,7 @@ CONFIG_NET_IPVTI=m # CONFIG_NETIUCV is not set CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 2eb66a35b..f1d9ef696 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2036,6 +2036,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100 is not set # CONFIG_IPW2200_DEBUG is not set @@ -2992,7 +2993,7 @@ CONFIG_NET_IPVTI=m # CONFIG_NETIUCV is not set CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 154448383..b5380420a 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2311,6 +2311,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3308,7 +3309,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 357102b0d..9e1aea9a3 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2293,6 +2293,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8 CONFIG_IP_VS_TAB_BITS=12 CONFIG_IP_VS_WLC=m CONFIG_IP_VS_WRR=m +CONFIG_IPVTAP=m # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y @@ -3288,7 +3289,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPVTI=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_NET_L3_MASTER_DEV=y CONFIG_NETLABEL=y CONFIG_NETLINK_DIAG=m CONFIG_NET_MPLS_GSO=m diff --git a/kernel.spec b/kernel.spec index cc621d631..939f258da 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 8 +%define gitrev 9 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -514,9 +514,6 @@ Patch001: kbuild-AFTER_LINK.patch # ongoing complaint, full discussion delayed until ksummit/plumbers Patch002: 0001-iio-Use-event-header-from-kernel-tree.patch -# Still other instances of this bug floating around -Patch003: 0001-Work-around-for-gcc7-and-arm64.patch - %if !%{nopatches} # Git trees. @@ -2186,6 +2183,15 @@ fi # # %changelog +* Fri Mar 03 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git9.1 +- Linux v4.10-11319-gc82be9d + +* Thu Mar 02 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git8.2 +- rebuilt + +* Thu Mar 02 2017 Laura Abbott <labbott@fedoraproject.org> +- Enable CONFIG_NET_L3_MASTER_DEV (rhbz 1428530) + * Thu Mar 02 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git8.1 - Linux v4.10-11073-g4977ab6 @@ -1,3 +1,3 @@ SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 -SHA512 (patch-4.10-git8.xz) = 30b9a9a06a4795cf208e16274bc4dd4731c1af758cb9510ab77a8347100712a56d20d9697f1dd1420c89d039110dadb8379b1dc3bbe0834207afba97291043a2 +SHA512 (patch-4.10-git9.xz) = 7e934f2001741547552ace9f4f81da423cc21607c27bcc8c73312a57d7ac29d1f2e191c6739380518cd11828a5b01a36fddb2a4eb5cc214773dff6024279c5cd |