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 /kernel-aarch64.config | |
| parent | eeb02ab1254c199a785ccd8bbe350d50f12598c6 (diff) | |
| parent | 69ffe69523fa331720bb430b6e02cc0ec572c72a (diff) | |
| download | kernel-f532038be75c4e215d5759b0cbd57c20ca5f3f20.tar.gz kernel-f532038be75c4e215d5759b0cbd57c20ca5f3f20.tar.xz kernel-f532038be75c4e215d5759b0cbd57c20ca5f3f20.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
Diffstat (limited to 'kernel-aarch64.config')
| -rw-r--r-- | kernel-aarch64.config | 3 |
1 files changed, 2 insertions, 1 deletions
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 |