Linux v4.20-rc6-82-g65e08c5e8631

6 files changed, 13 insertions, 7 deletions

diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT b/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
index be1de779f..e41f0cf8f 100644
--- a/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
@@ -1 +1 @@
-CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y
+# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
diff --git a/gitrev b/gitrev
index 48f7a9dee..618da14c3 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-f5d582777bcb1c7ff19a5a2343f66ea01de401c6
+65e08c5e86311143f45c3e4389561af3107fc8f6
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 967a8c1a9..77c7a8771 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -215,7 +215,7 @@ CONFIG_AMD8111_ETH=m
 # CONFIG_AMD_IOMMU_DEBUGFS is not set
 CONFIG_AMD_IOMMU_V2=m
 CONFIG_AMD_IOMMU=y
-CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y
+# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
 CONFIG_AMD_MEM_ENCRYPT=y
 CONFIG_AMD_NUMA=y
 CONFIG_AMD_PHY=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 0e83467ef..988da4449 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -215,7 +215,7 @@ CONFIG_AMD8111_ETH=m
 # CONFIG_AMD_IOMMU_DEBUGFS is not set
 CONFIG_AMD_IOMMU_V2=m
 CONFIG_AMD_IOMMU=y
-CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y
+# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
 CONFIG_AMD_MEM_ENCRYPT=y
 CONFIG_AMD_NUMA=y
 CONFIG_AMD_PHY=m
diff --git a/kernel.spec b/kernel.spec
index 995b30f26..df5760e36 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -122,7 +122,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
 
 # Kernel headers are being split out into a separate package
 %if 0%{?fedora}
@@ -1881,6 +1881,12 @@ fi
 #
 #
 %changelog
+* Thu Dec 13 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc6.git2.1
+- Linux v4.20-rc6-82-g65e08c5e8631
+
+* Wed Dec 12 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc6.git1.2
+- Reenable debugging options.
+
 * Tue Dec 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc6.git1.1
 - Linux v4.20-rc6-25-gf5d582777bcb
 
diff --git a/sources b/sources
index b07716bbf..f533da905 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 SHA512 (patch-4.20-rc6.xz) = 4958f79defd55bb5d66bd303f91089f0ff76816e8e13749865efe2e32fb264ea7a6d683e6e9efe3a65e0f5748c34ed1079afb930d1a2e12dac0ce236380bd755
-SHA512 (patch-4.20-rc6-git1.xz) = 4815e8a602e4b3560b3e29d4d731c661cf1f262fcebd7a3697f92d6c4b7fded443488fcf5ec71a60deb155a71aeb06e4a110a6eec876437c1d51c96ff01f28e9
+SHA512 (patch-4.20-rc6-git2.xz) = ee59825f935376097ac459ea01f08982cb6050fc71c8afaf36e03593841a9321bd0d358ac6e29d16c119d3034d3b562ea98beb11187583c4cee0ff9e1c2934d5