diff options
-rw-r--r-- | configs/fedora/generic/CONFIG_I2C_NVIDIA_GPU | 1 | ||||
-rw-r--r-- | configs/fedora/generic/CONFIG_UCSI_CCG | 1 | ||||
-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-i686-debug.config | 2 | ||||
-rw-r--r-- | kernel-i686.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le.config | 2 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
-rw-r--r-- | kernel-s390x.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
-rw-r--r-- | kernel-x86_64.config | 2 | ||||
-rw-r--r-- | kernel.spec | 7 | ||||
-rw-r--r-- | sources | 3 |
18 files changed, 35 insertions, 5 deletions
diff --git a/configs/fedora/generic/CONFIG_I2C_NVIDIA_GPU b/configs/fedora/generic/CONFIG_I2C_NVIDIA_GPU new file mode 100644 index 000000000..f7f160972 --- /dev/null +++ b/configs/fedora/generic/CONFIG_I2C_NVIDIA_GPU @@ -0,0 +1 @@ +CONFIG_I2C_NVIDIA_GPU=m diff --git a/configs/fedora/generic/CONFIG_UCSI_CCG b/configs/fedora/generic/CONFIG_UCSI_CCG new file mode 100644 index 000000000..63864ea93 --- /dev/null +++ b/configs/fedora/generic/CONFIG_UCSI_CCG @@ -0,0 +1 @@ +CONFIG_UCSI_CCG=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 2c837b045..9b46a9fc6 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2238,6 +2238,7 @@ CONFIG_I2C_MV64XXX=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set # CONFIG_I2C_NOMADIK is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m @@ -6299,6 +6300,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c46d71c4a..85799ab09 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2221,6 +2221,7 @@ CONFIG_I2C_MV64XXX=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set # CONFIG_I2C_NOMADIK is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m @@ -6276,6 +6277,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 357ce391b..53c03b295 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2348,6 +2348,7 @@ CONFIG_I2C_MV64XXX=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set # CONFIG_I2C_NOMADIK is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y # CONFIG_I2C_PARPORT_LIGHT is not set @@ -6723,6 +6724,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index f6ec92b4a..b21c4930a 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2240,6 +2240,7 @@ CONFIG_I2C_MV64XXX=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set # CONFIG_I2C_NOMADIK is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m @@ -6318,6 +6319,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index c02cdc297..8ed390e00 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2224,6 +2224,7 @@ CONFIG_I2C_MV64XXX=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set # CONFIG_I2C_NOMADIK is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m @@ -6296,6 +6297,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index ffe94d74b..730a29f5d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2332,6 +2332,7 @@ CONFIG_I2C_MV64XXX=m CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set # CONFIG_I2C_NOMADIK is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y # CONFIG_I2C_PARPORT_LIGHT is not set @@ -6701,6 +6702,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 12568cd48..cedf94274 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2083,6 +2083,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_MUX_REG is not set CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PARPORT=m @@ -5915,6 +5916,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-i686.config b/kernel-i686.config index b07d119a8..77268ca04 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2065,6 +2065,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_MUX_REG is not set CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PARPORT=m @@ -5893,6 +5894,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index f3fb40b4f..96632a20c 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -1921,6 +1921,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_MUX_REG is not set CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OPAL=m # CONFIG_I2C_PARPORT_LIGHT is not set @@ -5592,6 +5593,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UCB1400_CORE is not set # CONFIG_UCC_GETH is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m # CONFIG_UDBG_RTAS_CONSOLE is not set CONFIG_UDF_FS=m CONFIG_UDMABUF=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 1a7897ef9..ea98ed819 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1903,6 +1903,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_MUX_REG is not set CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NFORCE2_S4985 is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OPAL=m # CONFIG_I2C_PARPORT_LIGHT is not set @@ -5568,6 +5569,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UCB1400_CORE is not set # CONFIG_UCC_GETH is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m # CONFIG_UDBG_RTAS_CONSOLE is not set CONFIG_UDF_FS=m CONFIG_UDMABUF=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 5bac3400f..21c0d8c2b 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1880,6 +1880,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_MUX_REG is not set # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_NFORCE2_S4985 is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PCA_PLATFORM is not set @@ -5486,6 +5487,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index c8ffb5a24..98db056df 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1862,6 +1862,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_MUX_REG is not set # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_NFORCE2_S4985 is not set +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PCA_PLATFORM is not set @@ -5462,6 +5463,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 2b5068ace..c13f76068 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2116,6 +2116,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_MUX_REG is not set CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PARPORT=m @@ -5953,6 +5954,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index aefc19775..d74202ec0 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2098,6 +2098,7 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_MUX_REG is not set CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PARPORT=m @@ -5931,6 +5932,7 @@ CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN_SANITIZE_ALL is not set # CONFIG_UCB1400_CORE is not set CONFIG_UCSI_ACPI=m +CONFIG_UCSI_CCG=m CONFIG_UDF_FS=m CONFIG_UDMABUF=y # CONFIG_UEVENT_HELPER is not set diff --git a/kernel.spec b/kernel.spec index a32753f85..f9859582b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 1 +%global rcrev 2 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1872,7 +1872,8 @@ fi # # %changelog -* Mon Nov 12 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc1.git4.2 +* Sun Nov 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc2.git0.1 +- Linux v4.20-rc2 - Disable debugging options. * Fri Nov 09 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc1.git4.1 @@ -1,3 +1,2 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -SHA512 (patch-4.20-rc1.xz) = 60b0247b40be26429ce319cd6b27b67ca61afc4663ebe61f172349cc3e42ce6915427527693a519fc4afce43117c83513292e7dfa08b2d522baca3489cebf80a -SHA512 (patch-4.20-rc1-git4.xz) = c5a3c824786a01779720249209747e79880cf15f1a4df1c201a2c41723d455591a220268ceaa9e50ab0e6795387356a851e04f3ffe1f0bfb4d3cbca54aed47a2 +SHA512 (patch-4.20-rc2.xz) = 972440b6421305b814c4637afb1755b18af88cbcdb7042a91f0541caed55a5945dedea8d2aab70ef000aae7c745e4c7075dee78f13ea74a72f55eb71d51b1ef5 |