From 8a80a030dcbbf45dfcee3b0df5d68fc3faa5c6a4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 27 Apr 2018 10:42:54 +0100 Subject: [PATCH] Enable QLogic NICs on ARM --- baseconfig/arm/CONFIG_NET_VENDOR_QLOGIC | 1 - kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel.spec | 3 +++ 8 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 baseconfig/arm/CONFIG_NET_VENDOR_QLOGIC diff --git a/baseconfig/arm/CONFIG_NET_VENDOR_QLOGIC b/baseconfig/arm/CONFIG_NET_VENDOR_QLOGIC deleted file mode 100644 index 700f6a5e2..000000000 --- a/baseconfig/arm/CONFIG_NET_VENDOR_QLOGIC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NET_VENDOR_QLOGIC is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 92eeae63a..9c98691a1 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3658,7 +3658,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_NVIDIA=y CONFIG_NET_VENDOR_OKI=y -# CONFIG_NET_VENDOR_QLOGIC is not set +CONFIG_NET_VENDOR_QLOGIC=y CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index be0b1aa5c..e71d019c2 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3636,7 +3636,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_NVIDIA=y CONFIG_NET_VENDOR_OKI=y -# CONFIG_NET_VENDOR_QLOGIC is not set +CONFIG_NET_VENDOR_QLOGIC=y CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 62d11ec35..266d5886b 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3891,7 +3891,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_NVIDIA=y CONFIG_NET_VENDOR_OKI=y -# CONFIG_NET_VENDOR_QLOGIC is not set +CONFIG_NET_VENDOR_QLOGIC=y # CONFIG_NET_VENDOR_QUALCOMM is not set CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 4f80fec11..662f28536 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3714,7 +3714,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_NVIDIA=y CONFIG_NET_VENDOR_OKI=y -# CONFIG_NET_VENDOR_QLOGIC is not set +CONFIG_NET_VENDOR_QLOGIC=y # CONFIG_NET_VENDOR_QUALCOMM is not set CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 3fad35058..6b8f003e7 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3692,7 +3692,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_NVIDIA=y CONFIG_NET_VENDOR_OKI=y -# CONFIG_NET_VENDOR_QLOGIC is not set +CONFIG_NET_VENDOR_QLOGIC=y # CONFIG_NET_VENDOR_QUALCOMM is not set CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 55833206a..012edee0b 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3869,7 +3869,7 @@ CONFIG_NET_VENDOR_NATSEMI=y CONFIG_NET_VENDOR_NETRONOME=y CONFIG_NET_VENDOR_NVIDIA=y CONFIG_NET_VENDOR_OKI=y -# CONFIG_NET_VENDOR_QLOGIC is not set +CONFIG_NET_VENDOR_QLOGIC=y # CONFIG_NET_VENDOR_QUALCOMM is not set CONFIG_NET_VENDOR_RDC=y CONFIG_NET_VENDOR_REALTEK=y diff --git a/kernel.spec b/kernel.spec index c26e6afb7..39a18fcb9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1931,6 +1931,9 @@ fi # # %changelog +* Fri Apr 27 2018 Peter Robinson +- Enable QLogic NICs on ARM + * Wed Apr 25 2018 Jeremy Cline - Fix a kernel oops when using Thunderbolt 3 docks (rhbz 1565131)