From a6847a83be3f9a20879e1a5f0d73bbdae008dbb7 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 6bec03378..e2c278f55 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3657,7 +3657,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 f46621da3..cb216ea8b 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3635,7 +3635,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 3dc02210d..2fd9013d7 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3889,7 +3889,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 9bb109485..6bc041c60 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3712,7 +3712,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 10dfd2e99..73895c65f 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3690,7 +3690,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 3b5c35e1e..2564bc842 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3867,7 +3867,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 fe6d55948..81eb3ca0f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1922,6 +1922,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)