summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2018-04-27 10:42:54 +0100
committerJeremy Cline <jeremy@jcline.org>2018-04-27 13:25:03 -0400
commita6847a83be3f9a20879e1a5f0d73bbdae008dbb7 (patch)
treef1420850504f5e415cc1e7c61aaa87e272f02097
parentba88fed13733ff93b3a458dead81b6d227019493 (diff)
downloadkernel-a6847a83be3f9a20879e1a5f0d73bbdae008dbb7.tar.gz
kernel-a6847a83be3f9a20879e1a5f0d73bbdae008dbb7.tar.xz
kernel-a6847a83be3f9a20879e1a5f0d73bbdae008dbb7.zip
Enable QLogic NICs on ARM
-rw-r--r--baseconfig/arm/CONFIG_NET_VENDOR_QLOGIC1
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel.spec3
8 files changed, 9 insertions, 7 deletions
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 <pbrobinson@fedoraproject.org>
+- Enable QLogic NICs on ARM
+
* Wed Apr 25 2018 Jeremy Cline <jeremy@jcline.org>
- Fix a kernel oops when using Thunderbolt 3 docks (rhbz 1565131)