diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-27 19:36:58 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-27 19:36:58 +0200 |
commit | 09f0a4cdca73a65ae0ba083af60f28a2da805904 (patch) | |
tree | b4c5f210e614ea87ccd93bedfc82cbd9800f20e5 | |
parent | 6d467e7c4631a78b0b75914cbf6e9f691ff12329 (diff) | |
parent | 27491afc8c4cc9a973ae5e1c04c6a43b60e04662 (diff) | |
download | kernel-4.17.0-0.rc2.git3.1.vanilla.knurd.1.fc29.tar.gz kernel-4.17.0-0.rc2.git3.1.vanilla.knurd.1.fc29.tar.xz kernel-4.17.0-0.rc2.git3.1.vanilla.knurd.1.fc29.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc2.git3.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc2.git3.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc2.git3.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc2.git3.1.vanilla.knurd.1.fc26
-rw-r--r-- | configs/fedora/generic/arm/CONFIG_NET_VENDOR_QLOGIC | 1 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
-rw-r--r-- | kernel-aarch64.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl.config | 2 | ||||
-rw-r--r-- | kernel.spec | 8 | ||||
-rw-r--r-- | sources | 2 |
10 files changed, 15 insertions, 10 deletions
diff --git a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_QLOGIC b/configs/fedora/generic/arm/CONFIG_NET_VENDOR_QLOGIC deleted file mode 100644 index 700f6a5e2..000000000 --- a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_QLOGIC +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NET_VENDOR_QLOGIC is not set @@ -1 +1 @@ -69bfd470f4623d2d57ad62cb33791cded0c662f4 +0644f186fc9d77bb5bd198369e59fb28927a3692 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index a5e4762b0..0937f8e64 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3724,7 +3724,7 @@ CONFIG_NET_VENDOR_NETRONOME=y # CONFIG_NET_VENDOR_NI is not set 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 9ec457e8c..49be9c861 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3702,7 +3702,7 @@ CONFIG_NET_VENDOR_NETRONOME=y # CONFIG_NET_VENDOR_NI is not set 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 07638ed25..52d08b6e5 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3938,7 +3938,7 @@ CONFIG_NET_VENDOR_NETRONOME=y # CONFIG_NET_VENDOR_NI is not set 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 45ca168cb..0127b52d0 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3761,7 +3761,7 @@ CONFIG_NET_VENDOR_NETRONOME=y # CONFIG_NET_VENDOR_NI is not set 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 1cbfe127f..4320defa8 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3739,7 +3739,7 @@ CONFIG_NET_VENDOR_NETRONOME=y # CONFIG_NET_VENDOR_NI is not set 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 459d5113c..b9a9121e8 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3916,7 +3916,7 @@ CONFIG_NET_VENDOR_NETRONOME=y # CONFIG_NET_VENDOR_NI is not set 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 9bfbbd4ae..329968fb1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1898,6 +1898,12 @@ fi # # %changelog +* Fri Apr 27 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc2.git3.1 +- Linux v4.17-rc2-155-g0644f186fc9d + +* Fri Apr 27 2018 Peter Robinson <pbrobinson@fedoraproject.org> +- Enable QLogic NICs on ARM + * Thu Apr 26 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc2.git2.1 - Linux v4.17-rc2-104-g69bfd470f462 @@ -1,3 +1,3 @@ SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662 SHA512 (patch-4.17-rc2.xz) = 9456b16b16dc389b7f53cef01078b537557bbf28fb3a0ce286fbfef1605eb498c966dd98cff9e98eb772598c39b2e62643b3ef591112dbb8eb2ec06cbd18c7c6 -SHA512 (patch-4.17-rc2-git2.xz) = d33d0c5a95853ddb61c36e9a60769c699708e44446a0c3c129a5ccc6d368f3548fb82cddd7412dcb6356bc179ee4e533c5fa3374d56fb28c500106df7af489bb +SHA512 (patch-4.17-rc2-git3.xz) = 590477c87240a5e4a3626185cb3c443c81a8e69e151fbc946987b0e5c5a2536c521a5bdd94cffa4b0cf825590089d3cb491575da20b02a694e40526853feba0d |