diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-17 12:34:33 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-03-17 12:34:33 -0500 |
| commit | ee22e4872dec1ab1f08fabe765e18b945ebcc29e (patch) | |
| tree | e3aab8d4f9d60b9d21824c1afe5f6d104735d522 | |
| parent | 7a6f123bd34c17ddaecab36a3541de8843d958e6 (diff) | |
| download | kernel-ee22e4872dec1ab1f08fabe765e18b945ebcc29e.tar.gz kernel-ee22e4872dec1ab1f08fabe765e18b945ebcc29e.tar.xz kernel-ee22e4872dec1ab1f08fabe765e18b945ebcc29e.zip | |
kernel-5.11.7-9
* Wed Mar 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.7-9]
- Disable weak-modules again rhbz 1828455 (Justin M. Forbes)
- More config updates for gcc-plugin turn off (Justin M. Forbes)
- 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>
27 files changed, 320 insertions, 413 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index df4a3ee4e..f74bfc4ea 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 8 +RHEL_RELEASE = 9 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index cff5bfd4b..ac2d65602 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -862,12 +862,8 @@ CONFIG_CADENCE_WATCHDOG=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 @@ -880,28 +876,28 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set CONFIG_CAN_MCP251X=m -CONFIG_CAN_PEAK_PCIEC=y +# 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 diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 883ce434f..d242cd518 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -627,12 +627,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 @@ -645,31 +641,33 @@ CONFIG_CAN_ESD_USB2=m CONFIG_CAN_GW=m # CONFIG_CAN_HI311X is not set # CONFIG_CAN_IFI_CANFD 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_LEDS is not set CONFIG_CAN=m -# CONFIG_CAN_M_CAN 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 diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index b48eee314..ebbdc67bf 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -862,12 +862,8 @@ CONFIG_CADENCE_WATCHDOG=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 @@ -880,28 +876,28 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set CONFIG_CAN_MCP251X=m -CONFIG_CAN_PEAK_PCIEC=y +# 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 diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 2a8dcf15b..d434414c1 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -627,12 +627,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 @@ -645,31 +641,33 @@ CONFIG_CAN_ESD_USB2=m CONFIG_CAN_GW=m # CONFIG_CAN_HI311X is not set # CONFIG_CAN_IFI_CANFD 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_LEDS is not set CONFIG_CAN=m -# CONFIG_CAN_M_CAN 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 diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index b95697d07..5d93a3b9e 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -889,12 +889,8 @@ CONFIG_CADENCE_WATCHDOG=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 @@ -907,20 +903,22 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set CONFIG_CAN_MCP251X=m -CONFIG_CAN_PEAK_PCIEC=y +# CONFIG_CAN_PEAK_PCIEC is not set CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_USB=m @@ -928,9 +926,7 @@ CONFIG_CAN_PLX_PCI=m CONFIG_CAN_RAW=m # CONFIG_CAN_RCAR_CANFD is not set # CONFIG_CAN_RCAR is not set -# 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 diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 146551be8..2203f3efc 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -889,12 +889,8 @@ CONFIG_CADENCE_WATCHDOG=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 @@ -907,20 +903,22 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set CONFIG_CAN_MCP251X=m -CONFIG_CAN_PEAK_PCIEC=y +# CONFIG_CAN_PEAK_PCIEC is not set CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_USB=m @@ -928,9 +926,7 @@ CONFIG_CAN_PLX_PCI=m CONFIG_CAN_RAW=m # CONFIG_CAN_RCAR_CANFD is not set # CONFIG_CAN_RCAR is not set -# 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 diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index ac6e5117b..c89b13aa8 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -867,12 +867,8 @@ CONFIG_CADENCE_WATCHDOG=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 @@ -885,20 +881,22 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set CONFIG_CAN_MCP251X=m -CONFIG_CAN_PEAK_PCIEC=y +# CONFIG_CAN_PEAK_PCIEC is not set CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_USB=m @@ -906,9 +904,7 @@ CONFIG_CAN_PLX_PCI=m CONFIG_CAN_RAW=m # CONFIG_CAN_RCAR_CANFD is not set # CONFIG_CAN_RCAR is not set -# 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 diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 05cc894bd..e83552816 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -867,12 +867,8 @@ CONFIG_CADENCE_WATCHDOG=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 @@ -885,20 +881,22 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set CONFIG_CAN_MCP251X=m -CONFIG_CAN_PEAK_PCIEC=y +# CONFIG_CAN_PEAK_PCIEC is not set CONFIG_CAN_PEAK_PCIEFD=m CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_USB=m @@ -906,9 +904,7 @@ CONFIG_CAN_PLX_PCI=m CONFIG_CAN_RAW=m # CONFIG_CAN_RCAR_CANFD is not set # CONFIG_CAN_RCAR is not set -# 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 diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 65eb53b10..55e3bf32c 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -699,12 +699,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 @@ -718,29 +714,29 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_PCMCIA is not set 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 @@ -4478,7 +4474,7 @@ CONFIG_PC8736x_GPIO=m # CONFIG_PC87413_WDT is not set CONFIG_PCCARD=y CONFIG_PCENGINES_APU2=m -CONFIG_PCH_CAN=m +# CONFIG_PCH_CAN is not set CONFIG_PCH_DMA=m CONFIG_PCH_GBE=m CONFIG_PCH_PHUB=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index f223f444d..7d92137d2 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -698,12 +698,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 @@ -717,29 +713,29 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_PCMCIA is not set 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 @@ -4456,7 +4452,7 @@ CONFIG_PC8736x_GPIO=m # CONFIG_PC87413_WDT is not set CONFIG_PCCARD=y CONFIG_PCENGINES_APU2=m -CONFIG_PCH_CAN=m +# CONFIG_PCH_CAN is not set CONFIG_PCH_DMA=m CONFIG_PCH_GBE=m CONFIG_PCH_PHUB=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 67562772e..5c0fc1e78 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -657,12 +657,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 @@ -675,29 +671,29 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set +CONFIG_CAN_MCP251X=m # CONFIG_CAN_MSCAN is not set -CONFIG_CAN_PEAK_PCIEC=y +# 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 diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 6d89b0311..8e2df2dc5 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -522,12 +522,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 @@ -540,32 +536,34 @@ CONFIG_CAN_ESD_USB2=m CONFIG_CAN_GW=m # CONFIG_CAN_HI311X is not set # CONFIG_CAN_IFI_CANFD 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_LEDS is not set CONFIG_CAN=m -# CONFIG_CAN_M_CAN 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set +CONFIG_CAN_MCP251X=m # CONFIG_CAN_MSCAN is not set -CONFIG_CAN_PEAK_PCIEC=y -# CONFIG_CAN_PEAK_PCIEFD is not set +# 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 diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 88ea7e0b6..f542bbdfd 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -656,12 +656,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 @@ -674,29 +670,29 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set +CONFIG_CAN_MCP251X=m # CONFIG_CAN_MSCAN is not set -CONFIG_CAN_PEAK_PCIEC=y +# 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 diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f2fbdb4a4..a81c93be2 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -522,12 +522,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 @@ -540,32 +536,34 @@ CONFIG_CAN_ESD_USB2=m CONFIG_CAN_GW=m # CONFIG_CAN_HI311X is not set # CONFIG_CAN_IFI_CANFD 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_LEDS is not set CONFIG_CAN=m -# CONFIG_CAN_M_CAN 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_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set +CONFIG_CAN_MCP251X=m # CONFIG_CAN_MSCAN is not set -CONFIG_CAN_PEAK_PCIEC=y -# CONFIG_CAN_PEAK_PCIEFD is not set +# 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 diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c3da04f04..35e078012 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -661,12 +661,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 @@ -680,27 +676,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 diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 00713d980..85344bf75 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -522,12 +522,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 @@ -541,30 +537,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 diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index d9d43f5b3..4c5b54338 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -660,12 +660,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 @@ -679,27 +675,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 diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 90f65bb7f..b7e87ecde 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -522,12 +522,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 @@ -541,30 +537,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 diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 635e35ba0..7fda0a5c7 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -527,12 +527,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 @@ -546,30 +542,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 diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 84fa19e63..cb5b07e9f 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -708,12 +708,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 @@ -727,29 +723,29 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_PCMCIA is not set 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 @@ -4521,7 +4517,7 @@ CONFIG_PATA_WINBOND=m # CONFIG_PC87413_WDT is not set CONFIG_PCCARD=y CONFIG_PCENGINES_APU2=m -CONFIG_PCH_CAN=m +# CONFIG_PCH_CAN is not set CONFIG_PCH_DMA=m CONFIG_PCH_GBE=m CONFIG_PCH_PHUB=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index c4bccef11..720cc17bb 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -550,12 +550,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 @@ -568,31 +564,33 @@ CONFIG_CAN_ESD_USB2=m CONFIG_CAN_GW=m # CONFIG_CAN_HI311X is not set # CONFIG_CAN_IFI_CANFD 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_LEDS is not set CONFIG_CAN=m -# CONFIG_CAN_M_CAN 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 diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index f9d9a6aa1..6f3547f73 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -707,12 +707,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 @@ -726,29 +722,29 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m CONFIG_CAN_HI311X=m CONFIG_CAN_IFI_CANFD=m -# 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 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_PCMCIA is not set 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 @@ -4499,7 +4495,7 @@ CONFIG_PATA_WINBOND=m # CONFIG_PC87413_WDT is not set CONFIG_PCCARD=y CONFIG_PCENGINES_APU2=m -CONFIG_PCH_CAN=m +# CONFIG_PCH_CAN is not set CONFIG_PCH_DMA=m CONFIG_PCH_GBE=m CONFIG_PCH_PHUB=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ad7cda508..06a3a432b 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -550,12 +550,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 @@ -568,31 +564,33 @@ CONFIG_CAN_ESD_USB2=m CONFIG_CAN_GW=m # CONFIG_CAN_HI311X is not set # CONFIG_CAN_IFI_CANFD 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_LEDS is not set CONFIG_CAN=m -# CONFIG_CAN_M_CAN 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 diff --git a/kernel.spec b/kernel.spec index eed1a1cb0..5c4c7fea9 100755 --- a/kernel.spec +++ b/kernel.spec @@ -104,7 +104,7 @@ Summary: The Linux kernel %define primary_target rhel %endif -%define rpmversion 5.11.6 +%define rpmversion 5.11.7 %define stableversion 5.11 %define pkgrelease 300 @@ -603,7 +603,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11.6.tar.xz +Source0: linux-5.11.7.tar.xz Source1: Makefile.rhelver @@ -1251,8 +1251,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.6 -c -mv linux-5.11.6 linux-%{KVERREL} +%setup -q -n kernel-5.11.7 -c +mv linux-5.11.7 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2468,10 +2468,12 @@ fi\ # %define kernel_variant_posttrans() \ %{expand:%%posttrans %{?1:%{1}-}core}\ +%if 0%{!?fedora:1}\ if [ -x %{_sbindir}/weak-modules ]\ then\ %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ fi\ +%endif\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} @@ -2763,6 +2765,18 @@ fi # # %changelog +* Wed Mar 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.7-9] +- Disable weak-modules again rhbz 1828455 (Justin M. Forbes) +- More config updates for gcc-plugin turn off (Justin M. Forbes) +- 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) + * Thu Mar 11 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.6-8] - Forgot to turn this back on when disabling gcc plugins (Justin M. Forbes) - Fedora: Turn on SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC option (Hans de Goede) diff --git a/patch-5.11-redhat.patch b/patch-5.11-redhat.patch index 9bae3f2be..d5ebaa20f 100644 --- a/patch-5.11-redhat.patch +++ b/patch-5.11-redhat.patch @@ -33,7 +33,6 @@ drivers/hid/hid-rmi.c | 64 --- drivers/input/rmi4/rmi_driver.c | 124 +++--- drivers/iommu/iommu.c | 22 + - drivers/mmc/host/sdhci-iproc.c | 18 + drivers/pci/controller/dwc/Kconfig | 10 +- drivers/pci/controller/dwc/Makefile | 2 +- drivers/pci/controller/dwc/pcie-tegra194.c | 102 +++++ @@ -60,7 +59,7 @@ security/security.c | 6 + sound/hda/Kconfig | 14 + sound/hda/intel-dsp-config.c | 29 +- - 62 files changed, 2144 insertions(+), 213 deletions(-) + 61 files changed, 2126 insertions(+), 213 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-platform_profile b/Documentation/ABI/testing/sysfs-platform_profile new file mode 100644 @@ -274,7 +273,7 @@ index 000000000000..c33a71263d9e + 2. Add the new profile name, along with a clear description of the + expected behaviour, to the sysfs-platform_profile ABI documentation. diff --git a/Makefile b/Makefile -index 472136a7881e..d390837b5d91 100644 +index 6ba32b82c480..20d2cb6a8bad 100644 --- a/Makefile +++ b/Makefile @@ -494,6 +494,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -1836,38 +1835,6 @@ index fd5f59373fc6..8a11aa9e0318 100644 /* * Changes the default domain of an iommu group that has *only* one device * -diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c -index c9434b461aab..ddeaf8e1f72f 100644 ---- a/drivers/mmc/host/sdhci-iproc.c -+++ b/drivers/mmc/host/sdhci-iproc.c -@@ -296,9 +296,27 @@ static const struct of_device_id sdhci_iproc_of_match[] = { - MODULE_DEVICE_TABLE(of, sdhci_iproc_of_match); - - #ifdef CONFIG_ACPI -+/* -+ * This is a duplicate of bcm2835_(pltfrm_)data without caps quirks -+ * which are provided by the ACPI table. -+ */ -+static const struct sdhci_pltfm_data sdhci_bcm_arasan_data = { -+ .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | -+ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | -+ SDHCI_QUIRK_NO_HISPD_BIT, -+ .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, -+ .ops = &sdhci_iproc_32only_ops, -+}; -+ -+static const struct sdhci_iproc_data bcm_arasan_data = { -+ .pdata = &sdhci_bcm_arasan_data, -+}; -+ - static const struct acpi_device_id sdhci_iproc_acpi_ids[] = { - { .id = "BRCM5871", .driver_data = (kernel_ulong_t)&iproc_cygnus_data }, - { .id = "BRCM5872", .driver_data = (kernel_ulong_t)&iproc_data }, -+ { .id = "BCM2847", .driver_data = (kernel_ulong_t)&bcm_arasan_data }, -+ { .id = "BRCME88C", .driver_data = (kernel_ulong_t)&bcm2711_data }, - { /* sentinel */ } - }; - MODULE_DEVICE_TABLE(acpi, sdhci_iproc_acpi_ids); diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig index 22c5529e9a65..259ff5ff3f24 100644 --- a/drivers/pci/controller/dwc/Kconfig @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.6.tar.xz) = bbf02e901c54ca4cad2688e983fa0d39b786607bc89581bfcc1108592e074b4c18a5fd939d730f82acacb9d8ce8df2c1d86f5d072f60e5216f39d4df2e367cf8 -SHA512 (kernel-abi-whitelists-5.11.6-300.tar.bz2) = 28fb7706da73d5cfc1bd6e0606233289652e8d26a76716392b659bf7f83e2c1cb90e32d476107478c8835394afe94729b221f9b317c5a1bc5daa77696dcf4777 -SHA512 (kernel-kabi-dw-5.11.6-300.tar.bz2) = 6db288b6cea167a3c73437e1a28c398240a94a235dfd6e4562c8ef39c4eaaba5c2ab5e6022ce7db3be7d35341ceba988c8bb83f0409ff685a832451ad6e3f4d4 +SHA512 (linux-5.11.7.tar.xz) = b8ec332cab3b050f5a541cb41c653dd68315bb0b9654db1d4bbce051d49f0ad7e01ae81b8c0e3316d836464083acf5616bad9457e489e17f890e36431c43b2fc +SHA512 (kernel-abi-whitelists-5.11.7-300.tar.bz2) = 97c10688691655a5c30a9b8ce3b23da3755ad0b21cb33a2fedcd1ca18569648c9ab7f4784e51d023fde23062d02a7c0433739f49044148dff0fe229abceeedbb +SHA512 (kernel-kabi-dw-5.11.7-300.tar.bz2) = 0f053d952de4f2f16854d0bee36487cf2deefa8bc7ec9f6c9105dd868d78a85a94252de00c9045e4573ed885ec2b91abdd3cf2df9f1485cf88af7a296412006a |