kernel-5.12.0-0.rc3.170

* Mon Mar 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc3.170]
- Fedora: filters: update to move dfl-emif to modules (Peter Robinson)
- drop duplicate DEVFREQ_GOV_SIMPLE_ONDEMAND config (Peter Robinson)
- efi: The EFI_VARS is legacy and now x86 only (Peter Robinson)
- common: enable RTC_SYSTOHC to supplement update_persistent_clock64 (Peter Robinson)
- generic: arm: enable SCMI for all options (Peter Robinson)
- fedora: the PCH_CAN driver is x86-32 only (Peter Robinson)
- common: disable legacy CAN device support (Peter Robinson)
- common: Enable Microchip MCP251x/MCP251xFD CAN controllers (Peter Robinson)
- common: Bosch MCAN support for Intel Elkhart Lake (Peter Robinson)
- common: enable CAN_PEAK_PCIEFD PCI-E driver (Peter Robinson)
- common: disable CAN_PEAK_PCIEC PCAN-ExpressCard (Peter Robinson)
- common: enable common CAN layer 2 protocols (Peter Robinson)
- ark: disable CAN_LEDS option (Peter Robinson)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

1 files changed, 18 insertions, 21 deletions

diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 13ab5723a..15c47108c 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -530,12 +530,8 @@ CONFIG_CACHEFILES=m
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_CC770_ISA is not set
-CONFIG_CAN_CC770=m
-CONFIG_CAN_CC770_PLATFORM=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PCI=m
-CONFIG_CAN_C_CAN_PLATFORM=m
+# CONFIG_CAN_CC770 is not set
+# CONFIG_CAN_C_CAN is not set
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
@@ -549,30 +545,32 @@ CONFIG_CAN_GW=m
 # CONFIG_CAN_HI311X is not set
 # CONFIG_CAN_IFI_CANFD is not set
 # CONFIG_CAN is not set
-# CONFIG_CAN_ISOTP is not set
-# CONFIG_CAN_J1939 is not set
+CONFIG_CAN_ISOTP=m
+CONFIG_CAN_J1939=m
 # CONFIG_CAN_KVASER_PCIEFD is not set
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_KVASER_USB=m
-CONFIG_CAN_LEDS=y
-# CONFIG_CAN_M_CAN is not set
+# CONFIG_CAN_LEDS is not set
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PCI=m
+# CONFIG_CAN_M_CAN_PLATFORM is not set
+# CONFIG_CAN_M_CAN_TCAN4X5X is not set
 # CONFIG_CAN_MCBA_USB is not set
-# CONFIG_CAN_MCP251XFD is not set
-# CONFIG_CAN_MCP251X is not set
-CONFIG_CAN_PEAK_PCIEC=y
-# CONFIG_CAN_PEAK_PCIEFD is not set
+CONFIG_CAN_MCP251XFD=m
+# CONFIG_CAN_MCP251XFD_SANITY is not set
+CONFIG_CAN_MCP251X=m
+# CONFIG_CAN_PEAK_PCIEC is not set
+CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_PEAK_PCI=m
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_RAW=m
-# CONFIG_CAN_SJA1000_ISA is not set
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_PLATFORM=m
+# CONFIG_CAN_SJA1000 is not set
 CONFIG_CAN_SLCAN=m
 CONFIG_CAN_SOFTING=m
 # CONFIG_CAN_UCAN is not set
 CONFIG_CAN_VCAN=m
-# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_VXCAN=m
 # CONFIG_CAN_XILINXCAN is not set
 CONFIG_CAPI_AVM=y
 # CONFIG_CAPI_EICON is not set
@@ -736,7 +734,6 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_CORDIC=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-# CONFIG_CORESIGHT is not set
 CONFIG_CORTINA_PHY=m
 # CONFIG_COUNTER is not set
 # CONFIG_CPU5_WDT is not set
@@ -3875,7 +3872,6 @@ CONFIG_PHY_BCM_SR_USB=m
 # CONFIG_PHY_QCOM_USB_SS is not set
 # CONFIG_PHY_TUSB1210 is not set
 # CONFIG_PI433 is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
 CONFIG_PID_NS=y
 CONFIG_PINCTRL_ALDERLAKE=m
 # CONFIG_PINCTRL_BROXTON is not set
@@ -4350,7 +4346,8 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 # CONFIG_RTC_NVMEM is not set
-# CONFIG_RTC_SYSTOHC is not set
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
 CONFIG_RT_GROUP_SCHED=y
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set