diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-15 10:57:59 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-15 10:57:59 -0500 |
| commit | 613e26bbec9f6f62fe7f9989c39370c1273d545a (patch) | |
| tree | 9146d6ce80261ec5af89e0cd96bd2aa44b4f5f6e /kernel-s390x-debug-fedora.config | |
| parent | 8e1dda7133e696704135e85542003b388372afa2 (diff) | |
| download | kernel-613e26bbec9f6f62fe7f9989c39370c1273d545a.tar.gz kernel-613e26bbec9f6f62fe7f9989c39370c1273d545a.tar.xz kernel-613e26bbec9f6f62fe7f9989c39370c1273d545a.zip | |
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>
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
| -rw-r--r-- | kernel-s390x-debug-fedora.config | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index d06d63eab..01d7afc70 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -664,12 +664,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=y CONFIG_CAN_DEV=m CONFIG_CAN_EMS_PCI=m @@ -683,27 +679,27 @@ CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m # 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 is not set CONFIG_CAN_M_CAN=m -# CONFIG_CAN_M_CAN_PCI is not set +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=m -# CONFIG_CAN_MCP251XFD is not set -# CONFIG_CAN_MCP251X is not set -CONFIG_CAN_PEAK_PCIEC=y +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_CS is not set CONFIG_CAN_SOFTING=m @@ -1594,7 +1590,6 @@ CONFIG_ET131X=m CONFIG_ETHERNET=y # CONFIG_ETHOC is not set CONFIG_ETHTOOL_NETLINK=y -# CONFIG_ETM4X_IMPDEF_FEATURE is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y @@ -4821,7 +4816,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 is not set CONFIG_RTL8180=m CONFIG_RTL8187=m |