Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc0.git3.1.vanilla.knurd.1.fc33kernel-5.7.0-0.rc0.git3.1.vanilla.knurd.1.fc32kernel-5.7.0-0.rc0.git3.1.vanilla.knurd.1.fc31kernel-5.7.0-0.rc0.git3.1.vanilla.knurd.1.fc30

1 files changed, 15 insertions, 0 deletions

diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 27f92b377..fc6cc8cc4 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -335,6 +335,7 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BALLOON_COMPACTION=y
+CONFIG_BAREUDP=m
 CONFIG_BATMAN_ADV_BATMAN_V=y
 CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
@@ -474,6 +475,7 @@ CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
 CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_LIRC_MODE2=y
+CONFIG_BPF_LSM=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -709,6 +711,7 @@ CONFIG_CHELSIO_T4_DCB=y
 # CONFIG_CHELSIO_T4_FCOE is not set
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_TLS_DEVICE=y
 CONFIG_CHR_DEV_SCH=m
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_ST=m
@@ -1574,6 +1577,9 @@ CONFIG_FSI_OCC=m
 CONFIG_FSI_SBEFIFO=m
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_MDIO is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_LBC is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
@@ -2286,6 +2292,7 @@ CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_IPV6_PIMSM_V2=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_RPL_LWTUNNEL=y
 CONFIG_IPV6_SEG6_HMAC=y
 CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SIT_6RD=y
@@ -2724,6 +2731,7 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 # CONFIG_MAG3110 is not set
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
+CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MAILBOX is not set
@@ -2788,8 +2796,10 @@ CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
 # CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_MVUSB=m
 # CONFIG_MDIO_OCTEON is not set
 # CONFIG_MDIO_THUNDER is not set
+CONFIG_MDIO_XPCS=m
 CONFIG_MD_LINEAR=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_RAID0=m
@@ -2973,6 +2983,7 @@ CONFIG_MLX5_ESWITCH=y
 CONFIG_MLX5_INFINIBAND=m
 CONFIG_MLX5_MPFS=y
 CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLX5_TC_CT=y
 # CONFIG_MLX5_TLS is not set
 CONFIG_MLX90614=m
 CONFIG_MLX90632=m
@@ -3004,6 +3015,7 @@ CONFIG_MMC_CB710=m
 CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_DW_BLUEFIELD is not set
+CONFIG_MMC_HSQ=m
 CONFIG_MMC=m
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
@@ -4117,6 +4129,7 @@ CONFIG_PSTORE_RAM=m
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_ZSTD_COMPRESS is not set
 # CONFIG_PTDUMP_DEBUGFS is not set
+CONFIG_PTP_1588_CLOCK_IDT82P33=m
 CONFIG_PTP_1588_CLOCK_IDTCM=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
@@ -4882,6 +4895,7 @@ CONFIG_SERIAL_OF_PLATFORM=m
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SIFIVE is not set
+# CONFIG_SERIAL_SPRD is not set
 # CONFIG_SERIAL_ST_ASC is not set
 # CONFIG_SERIAL_TIMBERDALE is not set
 # CONFIG_SERIAL_UARTLITE is not set
@@ -6369,6 +6383,7 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_EMACLITE is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
 CONFIG_XILINX_VCU=m