diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-05-03 16:40:11 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-05-03 16:40:11 +0200 |
commit | 4a0069f972cfb37c1bdf4b0b4c0987b3c17f3f65 (patch) | |
tree | c24fa330aa5352df067ae897b990ce88e342de82 | |
parent | 3c10bb1ef0db374a5fe33c25a72c1c00a731d9c7 (diff) | |
parent | fd0dabfedcd267121c3632abf71974837bbb8eba (diff) | |
download | kernel-4a0069f972cfb37c1bdf4b0b4c0987b3c17f3f65.tar.gz kernel-4a0069f972cfb37c1bdf4b0b4c0987b3c17f3f65.tar.xz kernel-4a0069f972cfb37c1bdf4b0b4c0987b3c17f3f65.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r-- | configs/fedora/generic/CONFIG_HW_RANDOM_VIRTIO | 2 | ||||
-rw-r--r-- | configs/fedora/generic/CONFIG_VIRTIO | 1 | ||||
-rw-r--r-- | configs/fedora/generic/CONFIG_VIRTIO_PCI | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 5 | ||||
-rw-r--r-- | kernel-aarch64.config | 5 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 5 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 5 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 5 | ||||
-rw-r--r-- | kernel-armv7hl.config | 5 | ||||
-rw-r--r-- | kernel-i686-PAE.config | 5 | ||||
-rw-r--r-- | kernel-i686-PAEdebug.config | 5 | ||||
-rw-r--r-- | kernel-i686-debug.config | 5 | ||||
-rw-r--r-- | kernel-i686.config | 5 | ||||
-rw-r--r-- | kernel-ppc64-debug.config | 5 | ||||
-rw-r--r-- | kernel-ppc64.config | 5 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 5 | ||||
-rw-r--r-- | kernel-ppc64le.config | 5 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 5 | ||||
-rw-r--r-- | kernel-s390x.config | 5 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 5 | ||||
-rw-r--r-- | kernel-x86_64.config | 5 | ||||
-rw-r--r-- | kernel.spec | 11 | ||||
-rw-r--r-- | sources | 1 |
24 files changed, 68 insertions, 41 deletions
diff --git a/configs/fedora/generic/CONFIG_HW_RANDOM_VIRTIO b/configs/fedora/generic/CONFIG_HW_RANDOM_VIRTIO index 1b31e5535..ec44b8453 100644 --- a/configs/fedora/generic/CONFIG_HW_RANDOM_VIRTIO +++ b/configs/fedora/generic/CONFIG_HW_RANDOM_VIRTIO @@ -1 +1 @@ -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y diff --git a/configs/fedora/generic/CONFIG_VIRTIO b/configs/fedora/generic/CONFIG_VIRTIO new file mode 100644 index 000000000..300572920 --- /dev/null +++ b/configs/fedora/generic/CONFIG_VIRTIO @@ -0,0 +1 @@ +CONFIG_VIRTIO=y diff --git a/configs/fedora/generic/CONFIG_VIRTIO_PCI b/configs/fedora/generic/CONFIG_VIRTIO_PCI index 58505d3a5..902a03720 100644 --- a/configs/fedora/generic/CONFIG_VIRTIO_PCI +++ b/configs/fedora/generic/CONFIG_VIRTIO_PCI @@ -1 +1 @@ -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y @@ -1 +1 @@ -6da6c0db5316275015e8cc2959f12a17584aeb64 +2d618bdf71635463a4aa4ad0fe46ec852292bc0c diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 0937f8e64..e06593c2f 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2080,7 +2080,7 @@ CONFIG_HW_RANDOM_MSM=m CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XGENE=m CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_QCOM=m @@ -6603,8 +6603,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 49be9c861..d3e2449cf 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2062,7 +2062,7 @@ CONFIG_HW_RANDOM_MSM=m CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XGENE=m CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_QCOM=m @@ -6579,8 +6579,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 52d08b6e5..d1928d0a1 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2198,7 +2198,7 @@ CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_ST=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_OMAP=m CONFIG_HWSPINLOCK_QCOM=m @@ -7120,8 +7120,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 0127b52d0..422922884 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2090,7 +2090,7 @@ CONFIG_HW_RANDOM_MESON=m CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -6670,8 +6670,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 4320defa8..fe20d3283 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2072,7 +2072,7 @@ CONFIG_HW_RANDOM_MESON=m CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -6646,8 +6646,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index b9a9121e8..158622664 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2180,7 +2180,7 @@ CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_ST=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_OMAP=m CONFIG_HWSPINLOCK_QCOM=m @@ -7096,8 +7096,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 563b25788..eb215952f 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1916,7 +1916,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -6142,8 +6142,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index a6970df17..b18721fd8 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -1935,7 +1935,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -6165,8 +6165,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index f11cdf372..c60479484 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1935,7 +1935,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -6165,8 +6165,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-i686.config b/kernel-i686.config index 6520df0ef..8b7b0dbd8 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1916,7 +1916,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -6142,8 +6142,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index d18e99dad..edb4fd697 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -1828,7 +1828,7 @@ CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -5916,8 +5916,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 1e86c3859..cb7326086 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -1809,7 +1809,7 @@ CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -5891,8 +5891,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 6118269bc..ac2cd4547 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1780,7 +1780,7 @@ CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -5844,8 +5844,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 3f6efcbd5..08c524be1 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1761,7 +1761,7 @@ CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -5819,8 +5819,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index d17179af3..50f144524 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1743,7 +1743,7 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_S390=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -5737,8 +5737,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 2fb107362..687eec6d2 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1724,7 +1724,7 @@ CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_S390=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -5712,8 +5712,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 26ce140c7..f3c34b8f3 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1978,7 +1978,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -6257,8 +6257,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 7ef6b0ced..54758c525 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1959,7 +1959,7 @@ CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set @@ -6234,8 +6234,9 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m +CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y CONFIG_VITESSE_PHY=m CONFIG_VL6180=m diff --git a/kernel.spec b/kernel.spec index 9e5986099..232a9f1ae 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 3 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -132,7 +132,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 %if %{with_verbose} %define make_opts V=1 @@ -1891,6 +1891,13 @@ fi # # %changelog +* Wed May 02 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git2.1 +- Linux v4.17-rc3-13-g2d618bdf7163 + +* Tue May 01 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git1.1 +- Linux v4.17-rc3-5-gfff75eb2a08c +- Reenable debugging options. + * Mon Apr 30 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc3.git0.1 - Linux v4.17-rc3 @@ -1,2 +1,3 @@ SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662 SHA512 (patch-4.17-rc3.xz) = 5b8a72386f295628e5ebdccbfb25caea60237233496d3c98769942f40c83e7339f35b51b084e75cc8ced15d26b5194345ea9c38f724b138aae2cf498924bd3e7 +SHA512 (patch-4.17-rc3-git2.xz) = 3bcb9e247ad5588fd00274bc3dc59476e38b15321de7f8e6a506636ec5ee41a1d5aa3de33467bd0ea906da4bc29045859d1bc92eab2e0bb6209440f5a16c0999 |