Config changes for 5.4 kernel

kernel/build-kernel.sh

@@ -201,10 +201,8 @@ get_kernel_frag_path() {
 	results=$( ${cmdpath} -r -n ${all_configs} )
 	# Only consider results highlighting "not in final"
 	results=$(grep "${not_in_string}" <<< "$results")
-	# Do not care about options that are in whitelist if using experimental kernel
-	if [[ ${experimental_kernel} == "true" ]]; then
-		results=$(grep -v -f ${default_config_whitelist} <<< "$results")
-	fi
+	# Do not care about options that are in whitelist
+	results=$(grep -v -f ${default_config_whitelist} <<< "$results")
 
 	# Did we request any entries that did not make it?
 	local missing=$(echo $results | grep -v -q "${not_in_string}"; echo $?)

kernel/configs/fragments/common/network.conf

@@ -36,11 +36,6 @@ CONFIG_DEFAULT_BBR=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
-# Once we move to 5.4, INET6_XFRM_MODE_* are not needed. I don't think these are actually needed, but
-# for now we just place them in whitelist.conf:
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
 
 CONFIG_STP=y
 CONFIG_BRIDGE=y

kernel/configs/fragments/whitelist.conf

@@ -1,8 +1,5 @@
 # configuration options which may dropped in newer kernels
 # without generating an error in fragment merging
-CONFIG_INET6_XFRM_MODE_BEET
-CONFIG_INET6_XFRM_MODE_TRANSPORT
-CONFIG_INET6_XFRM_MODE_TUNNEL
 CONFIG_NF_NAT_IPV4
 CONFIG_NF_NAT_NEEDED
 CONFIG_NF_NAT_PROTO_DCCP

kernel/kata_config_version

@@ -1 +1 @@
-64
+65