Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc6.20211223gitbc491fb12513.44.vanilla.1.fc36kernel-5.16.0-0.rc6.20211223gitbc491fb12513.44.vanilla.1.fc35kernel-5.16.0-0.rc6.20211223gitbc491fb12513.44.vanilla.1.fc34

1 files changed, 9 insertions, 9 deletions

diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c166a321b..34096ac15 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -213,7 +213,7 @@ CONFIG_AMD_PMC=m
 # CONFIG_AMDTEE is not set
 # CONFIG_AMD_XGBE_DCB is not set
 # CONFIG_AMIGA_PARTITION is not set
-# CONFIG_AMT is not set
+CONFIG_AMT=m
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 CONFIG_ANDROID_BINDERFS=y
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
@@ -1595,7 +1595,7 @@ CONFIG_EROFS_FS=m
 CONFIG_EROFS_FS_POSIX_ACL=y
 CONFIG_EROFS_FS_SECURITY=y
 CONFIG_EROFS_FS_XATTR=y
-# CONFIG_EROFS_FS_ZIP_LZMA is not set
+CONFIG_EROFS_FS_ZIP_LZMA=y
 CONFIG_EROFS_FS_ZIP=y
 CONFIG_ET131X=m
 CONFIG_ETHERNET=y
@@ -1631,7 +1631,6 @@ CONFIG_EXTCON_USBC_TUSB320=m
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
-CONFIG_EXYNOS_CHIPID=y
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
@@ -2517,7 +2516,7 @@ CONFIG_IP_FIB_TRIE_STATS=y
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_IPMB is not set
+CONFIG_IPMI_IPMB=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_POWERNV=m
 CONFIG_IPMI_POWEROFF=m
@@ -3108,7 +3107,7 @@ CONFIG_MCP41010=m
 # CONFIG_MCP4531 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4922 is not set
-# CONFIG_MCTP is not set
+CONFIG_MCTP=y
 CONFIG_MD_AUTODETECT=y
 # CONFIG_MD_CLUSTER is not set
 CONFIG_MD_FAULTY=m
@@ -3670,7 +3669,7 @@ CONFIG_NET_DSA_TAG_KSZ=m
 CONFIG_NET_DSA_TAG_OCELOT_8021Q=m
 CONFIG_NET_DSA_TAG_OCELOT=m
 CONFIG_NET_DSA_TAG_RTL4_A=m
-# CONFIG_NET_DSA_TAG_RTL8_4 is not set
+CONFIG_NET_DSA_TAG_RTL8_4=m
 CONFIG_NET_DSA_TAG_SJA1105=m
 CONFIG_NET_DSA_TAG_TRAILER=m
 CONFIG_NET_DSA_TAG_XRS700X=m
@@ -3845,6 +3844,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_NET_TEAM_MODE_RANDOM=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 CONFIG_NET_TULIP=y
+CONFIG_NET_UDP_TUNNEL=m
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NET_VENDOR_ADAPTEC=y
@@ -4831,7 +4831,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
-# CONFIG_RPMSG_TTY is not set
+CONFIG_RPMSG_TTY=m
 # CONFIG_RPMSG_VIRTIO is not set
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
@@ -5847,7 +5847,7 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
+CONFIG_SND_SOC_MAX98520=m
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@@ -7334,7 +7334,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y
 CONFIG_XMON_DISASSEMBLY=y
 CONFIG_XMON=y
 CONFIG_XZ_DEC_IA64=y
-# CONFIG_XZ_DEC_MICROLZMA is not set
+CONFIG_XZ_DEC_MICROLZMA=y
 CONFIG_XZ_DEC_POWERPC=y
 CONFIG_XZ_DEC_SPARC=y
 # CONFIG_XZ_DEC_TEST is not set