rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into f26_mar2

This commit is contained in:
Laura Abbott 2017-03-02 13:26:12 -08:00
parent 29de5f9ac5 d60ee93427
commit 23315538c3
23 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baseconfig/CONFIG_IPVTAP Normal file
View File

@ -0,0 +1 @@
CONFIG_IPVTAP=m

2
baseconfig/CONFIG_NET_L3_MASTER_DEV
View File

@ -1 +1 @@
# CONFIG_NET_L3_MASTER_DEV is not set
CONFIG_NET_L3_MASTER_DEV=y

3
kernel-aarch64-debug.config
View File

@ -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

3
kernel-aarch64.config
View File

@ -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

3
kernel-armv7hl-debug.config
View File

@ -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

3
kernel-armv7hl-lpae-debug.config
View File

@ -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

3
kernel-armv7hl-lpae.config
View File

@ -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

3
kernel-armv7hl.config
View File

@ -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

3
kernel-i686-PAE.config
View File

@ -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

3
kernel-i686-PAEdebug.config
View File

@ -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

3
kernel-i686-debug.config
View File

@ -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

3
kernel-i686.config
View File

@ -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

3
kernel-ppc64-debug.config
View File

@ -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

3
kernel-ppc64.config
View File

@ -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

3
kernel-ppc64le-debug.config
View File

@ -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

3
kernel-ppc64le.config
View File

@ -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

3
kernel-ppc64p7-debug.config
View File

@ -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

3
kernel-ppc64p7.config
View File

@ -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

3
kernel-s390x-debug.config
View File

@ -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

3
kernel-s390x.config
View File

@ -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

3
kernel-x86_64-debug.config
View File

@ -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

3
kernel-x86_64.config
View File

@ -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

8
kernel.spec
View File

@ -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 1
%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -2166,6 +2166,12 @@ fi
#
#
%changelog
* 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