summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2019-05-07 12:04:31 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2019-05-07 12:04:31 -0500
commit2b2a5f0a2eea3e62eb9b8f4cbd428db15607bd18 (patch)
treeec44a8b6f95cd76389f628c4d9dd32b44b76e44b
parentda649d521577e9cadd6e0dcd6ff53664852c1fcd (diff)
downloadkernel-2b2a5f0a2eea3e62eb9b8f4cbd428db15607bd18.tar.gz
kernel-2b2a5f0a2eea3e62eb9b8f4cbd428db15607bd18.tar.xz
kernel-2b2a5f0a2eea3e62eb9b8f4cbd428db15607bd18.zip
Linux v5.1-1199-g71ae5fc87c34
-rw-r--r--configs/fedora/debug/CONFIG_LOCK_EVENT_COUNTS1
-rw-r--r--configs/fedora/generic/CONFIG_CRYPTO_ECRDSA1
-rw-r--r--configs/fedora/generic/CONFIG_LOCK_EVENT_COUNTS1
-rw-r--r--configs/fedora/generic/CONFIG_SENSORS_IR380641
-rw-r--r--configs/fedora/generic/CONFIG_SENSORS_ISL681371
-rw-r--r--configs/fedora/generic/CONFIG_TEST_STRSCPY1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_ARM_SMMU_V3_PMU1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_RANDOMIZE_BASE1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_RELOCATABLE1
-rw-r--r--configs/fedora/generic/x86/CONFIG_MICROCODE_OLD_INTERFACE1
-rw-r--r--efi-secureboot.patch6
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config6
-rw-r--r--kernel-aarch64.config6
-rw-r--r--kernel-armv7hl-debug.config5
-rw-r--r--kernel-armv7hl-lpae-debug.config5
-rw-r--r--kernel-armv7hl-lpae.config5
-rw-r--r--kernel-armv7hl.config5
-rw-r--r--kernel-i686-debug.config6
-rw-r--r--kernel-i686.config6
-rw-r--r--kernel-ppc64le-debug.config5
-rw-r--r--kernel-ppc64le.config5
-rw-r--r--kernel-s390x-debug.config9
-rw-r--r--kernel-s390x.config9
-rw-r--r--kernel-x86_64-debug.config6
-rw-r--r--kernel-x86_64.config6
-rw-r--r--kernel.spec10
-rwxr-xr-xscripts/generate-git-snapshot.sh2
-rw-r--r--sources1
31 files changed, 109 insertions, 8 deletions
diff --git a/configs/fedora/debug/CONFIG_LOCK_EVENT_COUNTS b/configs/fedora/debug/CONFIG_LOCK_EVENT_COUNTS
new file mode 100644
index 000000000..efa1f96dd
--- /dev/null
+++ b/configs/fedora/debug/CONFIG_LOCK_EVENT_COUNTS
@@ -0,0 +1 @@
+CONFIG_LOCK_EVENT_COUNTS=y
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_ECRDSA b/configs/fedora/generic/CONFIG_CRYPTO_ECRDSA
new file mode 100644
index 000000000..1126222a3
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_CRYPTO_ECRDSA
@@ -0,0 +1 @@
+CONFIG_CRYPTO_ECRDSA=m
diff --git a/configs/fedora/generic/CONFIG_LOCK_EVENT_COUNTS b/configs/fedora/generic/CONFIG_LOCK_EVENT_COUNTS
new file mode 100644
index 000000000..8fb759417
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_LOCK_EVENT_COUNTS
@@ -0,0 +1 @@
+# CONFIG_LOCK_EVENT_COUNTS is not set
diff --git a/configs/fedora/generic/CONFIG_SENSORS_IR38064 b/configs/fedora/generic/CONFIG_SENSORS_IR38064
new file mode 100644
index 000000000..3ccb6f2bb
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SENSORS_IR38064
@@ -0,0 +1 @@
+# CONFIG_SENSORS_IR38064 is not set
diff --git a/configs/fedora/generic/CONFIG_SENSORS_ISL68137 b/configs/fedora/generic/CONFIG_SENSORS_ISL68137
new file mode 100644
index 000000000..b7586e0dc
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SENSORS_ISL68137
@@ -0,0 +1 @@
+# CONFIG_SENSORS_ISL68137 is not set
diff --git a/configs/fedora/generic/CONFIG_TEST_STRSCPY b/configs/fedora/generic/CONFIG_TEST_STRSCPY
new file mode 100644
index 000000000..9e1d33f00
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_TEST_STRSCPY
@@ -0,0 +1 @@
+# CONFIG_TEST_STRSCPY is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM_SMMU_V3_PMU b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_SMMU_V3_PMU
new file mode 100644
index 000000000..827377f8c
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_SMMU_V3_PMU
@@ -0,0 +1 @@
+CONFIG_ARM_SMMU_V3_PMU=m
diff --git a/configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG b/configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG
new file mode 100644
index 000000000..5d9b84372
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_KEXEC_VERIFY_SIG
@@ -0,0 +1 @@
+# CONFIG_KEXEC_VERIFY_SIG is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST b/configs/fedora/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST
new file mode 100644
index 000000000..3b7418088
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_PROTECTED_VIRTUALIZATION_GUEST
@@ -0,0 +1 @@
+# CONFIG_PROTECTED_VIRTUALIZATION_GUEST is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_RANDOMIZE_BASE b/configs/fedora/generic/s390x/CONFIG_RANDOMIZE_BASE
new file mode 100644
index 000000000..20610a95a
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_RANDOMIZE_BASE
@@ -0,0 +1 @@
+CONFIG_RANDOMIZE_BASE=y
diff --git a/configs/fedora/generic/s390x/CONFIG_RELOCATABLE b/configs/fedora/generic/s390x/CONFIG_RELOCATABLE
new file mode 100644
index 000000000..36808edb3
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_RELOCATABLE
@@ -0,0 +1 @@
+CONFIG_RELOCATABLE=y
diff --git a/configs/fedora/generic/x86/CONFIG_MICROCODE_OLD_INTERFACE b/configs/fedora/generic/x86/CONFIG_MICROCODE_OLD_INTERFACE
new file mode 100644
index 000000000..7366a29d3
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_MICROCODE_OLD_INTERFACE
@@ -0,0 +1 @@
+# CONFIG_MICROCODE_OLD_INTERFACE is not set
diff --git a/efi-secureboot.patch b/efi-secureboot.patch
index f50169541..f115141df 100644
--- a/efi-secureboot.patch
+++ b/efi-secureboot.patch
@@ -201,9 +201,9 @@ index adeee6329f55..27a54ec878bd 100644
+
+ init_lockdown();
+
- dmi_scan_machine();
- dmi_memdev_walk();
- dmi_set_dump_stack_arch_desc();
+ dmi_setup();
+
+ /*
@@ -1159,8 +1164,6 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
diff --git a/gitrev b/gitrev
index 66515150b..d15ed23b6 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-ea9866793d1e925b4d320eaea409263b2a568f38
+71ae5fc87c34ecbdca293c2a5c563d6be2576558
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 5513ca6a5..9b5a3bb5d 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -358,6 +358,7 @@ CONFIG_ARM_SCPI_CPUFREQ=m
CONFIG_ARM_SCPI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
CONFIG_ARM_SDE_INTERFACE=y
+CONFIG_ARM_SMMU_V3_PMU=m
CONFIG_ARM_SMMU_V3=y
CONFIG_ARM_SMMU=y
CONFIG_ARM_SP805_WATCHDOG=m
@@ -1137,6 +1138,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -3043,6 +3045,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+CONFIG_LOCK_EVENT_COUNTS=y
# CONFIG_LOCK_STAT is not set
CONFIG_LOCK_TORTURE_TEST=m
CONFIG_LOCKUP_DETECTOR=y
@@ -5267,8 +5270,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -6161,6 +6166,7 @@ CONFIG_TEST_LIST_SORT=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index e0cf199b6..7c3890733 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -358,6 +358,7 @@ CONFIG_ARM_SCPI_CPUFREQ=m
CONFIG_ARM_SCPI_POWER_DOMAIN=m
CONFIG_ARM_SCPI_PROTOCOL=m
CONFIG_ARM_SDE_INTERFACE=y
+CONFIG_ARM_SMMU_V3_PMU=m
CONFIG_ARM_SMMU_V3=y
CONFIG_ARM_SMMU=y
CONFIG_ARM_SP805_WATCHDOG=m
@@ -1137,6 +1138,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -3025,6 +3027,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_LOCK_TORTURE_TEST is not set
CONFIG_LOCKUP_DETECTOR=y
@@ -5246,8 +5249,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -6139,6 +6144,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index b8882263b..681708071 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1139,6 +1139,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -3109,6 +3110,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+CONFIG_LOCK_EVENT_COUNTS=y
# CONFIG_LOCK_STAT is not set
CONFIG_LOCK_TORTURE_TEST=m
CONFIG_LOCKUP_DETECTOR=y
@@ -5448,8 +5450,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -6450,6 +6454,7 @@ CONFIG_TEST_LIST_SORT=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index e768fd4c6..19d52205c 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1102,6 +1102,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -3004,6 +3005,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+CONFIG_LOCK_EVENT_COUNTS=y
# CONFIG_LOCK_STAT is not set
CONFIG_LOCK_TORTURE_TEST=m
CONFIG_LOCKUP_DETECTOR=y
@@ -5193,8 +5195,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -6119,6 +6123,7 @@ CONFIG_TEST_LIST_SORT=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 7b866ffb9..86ca85f92 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1102,6 +1102,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -2987,6 +2988,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_LOCK_TORTURE_TEST is not set
CONFIG_LOCKUP_DETECTOR=y
@@ -5173,8 +5175,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -6098,6 +6102,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6e46a95f2..fb30dfe7a 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1139,6 +1139,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -3092,6 +3093,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_LOCK_TORTURE_TEST is not set
CONFIG_LOCKUP_DETECTOR=y
@@ -5428,8 +5430,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
CONFIG_SENSORS_ISL29018=m
CONFIG_SENSORS_ISL29028=m
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -6429,6 +6433,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index d9e952c27..b9ce41130 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -933,6 +933,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -2831,6 +2832,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
CONFIG_LOCK_DOWN_KERNEL=y
CONFIG_LOCKD_V4=y
+CONFIG_LOCK_EVENT_COUNTS=y
CONFIG_LOCK_STAT=y
CONFIG_LOCK_TORTURE_TEST=m
CONFIG_LOCKUP_DETECTOR=y
@@ -3109,6 +3111,7 @@ CONFIG_MICROCHIP_PHY=m
# CONFIG_MICROCHIP_T1_PHY is not set
CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_INTEL=y
+# CONFIG_MICROCODE_OLD_INTERFACE is not set
CONFIG_MICROCODE=y
CONFIG_MICROSEMI_PHY=m
CONFIG_MIGRATION=y
@@ -4816,8 +4819,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_K10TEMP=m
@@ -5610,6 +5615,7 @@ CONFIG_TEST_LIST_SORT=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index f4051cacf..81484f941 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -932,6 +932,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -2812,6 +2813,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
CONFIG_LOCK_DOWN_KERNEL=y
CONFIG_LOCKD_V4=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_LOCK_TORTURE_TEST is not set
CONFIG_LOCKUP_DETECTOR=y
@@ -3090,6 +3092,7 @@ CONFIG_MICROCHIP_PHY=m
# CONFIG_MICROCHIP_T1_PHY is not set
CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_INTEL=y
+# CONFIG_MICROCODE_OLD_INTERFACE is not set
CONFIG_MICROCODE=y
CONFIG_MICROSEMI_PHY=m
CONFIG_MIGRATION=y
@@ -4796,8 +4799,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_K10TEMP=m
@@ -5589,6 +5594,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index a476556e9..051bfbce4 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -859,6 +859,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -2586,6 +2587,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+CONFIG_LOCK_EVENT_COUNTS=y
CONFIG_LOCK_STAT=y
CONFIG_LOCK_TORTURE_TEST=m
CONFIG_LOCKUP_DETECTOR=y
@@ -4505,8 +4507,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -5255,6 +5259,7 @@ CONFIG_TEST_LIST_SORT=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 8fcf92615..bed084d82 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -858,6 +858,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -2567,6 +2568,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_LOCK_TORTURE_TEST is not set
CONFIG_LOCKUP_DETECTOR=y
@@ -4483,8 +4485,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -5232,6 +5236,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index bcfa2dc2a..f91d52b1b 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -861,6 +861,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -2385,6 +2386,7 @@ CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_UNCOMPRESSED is not set
# CONFIG_KERNEL_XZ is not set
CONFIG_KEXEC_FILE=y
+# CONFIG_KEXEC_VERIFY_SIG is not set
CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADC is not set
# CONFIG_KEYBOARD_ADP5588 is not set
@@ -2561,6 +2563,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+CONFIG_LOCK_EVENT_COUNTS=y
CONFIG_LOCK_STAT=y
CONFIG_LOCK_TORTURE_TEST=m
CONFIG_LOCKUP_DETECTOR=y
@@ -3853,6 +3856,7 @@ CONFIG_PROC_VMCORE_DEVICE_DUMP=y
CONFIG_PROC_VMCORE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
CONFIG_PROFILING=y
+# CONFIG_PROTECTED_VIRTUALIZATION_GUEST is not set
CONFIG_PROVE_LOCKING=y
CONFIG_PROVE_RCU=y
CONFIG_PSAMPLE=m
@@ -3934,6 +3938,7 @@ CONFIG_RADIO_WL1273=m
# CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m
CONFIG_RAPIDIO_CPS_GEN2=m
@@ -4031,6 +4036,7 @@ CONFIG_REISERFS_FS_XATTR=y
CONFIG_REISERFS_PROC_INFO=y
CONFIG_RELAY=y
# CONFIG_RELOCATABLE_TEST is not set
+CONFIG_RELOCATABLE=y
CONFIG_REMOTEPROC=m
# CONFIG_RENESAS_PHY is not set
# CONFIG_RESET_ATTACK_MITIGATION is not set
@@ -4452,8 +4458,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -5192,6 +5200,7 @@ CONFIG_TEST_LIST_SORT=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 0acb61b8b..4ff841848 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -860,6 +860,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -2366,6 +2367,7 @@ CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_UNCOMPRESSED is not set
# CONFIG_KERNEL_XZ is not set
CONFIG_KEXEC_FILE=y
+# CONFIG_KEXEC_VERIFY_SIG is not set
CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADC is not set
# CONFIG_KEYBOARD_ADP5588 is not set
@@ -2542,6 +2544,7 @@ CONFIG_LOCKD=m
# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set
# CONFIG_LOCK_DOWN_KERNEL is not set
CONFIG_LOCKD_V4=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_LOCK_TORTURE_TEST is not set
CONFIG_LOCKUP_DETECTOR=y
@@ -3832,6 +3835,7 @@ CONFIG_PROC_VMCORE_DEVICE_DUMP=y
CONFIG_PROC_VMCORE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
CONFIG_PROFILING=y
+# CONFIG_PROTECTED_VIRTUALIZATION_GUEST is not set
# CONFIG_PROVE_LOCKING is not set
CONFIG_PSAMPLE=m
# CONFIG_PSI_DEFAULT_DISABLED is not set
@@ -3912,6 +3916,7 @@ CONFIG_RADIO_WL1273=m
# CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_RANDOMIZE_BASE=y
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m
CONFIG_RAPIDIO_CPS_GEN2=m
@@ -4009,6 +4014,7 @@ CONFIG_REISERFS_FS_XATTR=y
CONFIG_REISERFS_PROC_INFO=y
CONFIG_RELAY=y
# CONFIG_RELOCATABLE_TEST is not set
+CONFIG_RELOCATABLE=y
CONFIG_REMOTEPROC=m
# CONFIG_RENESAS_PHY is not set
# CONFIG_RESET_ATTACK_MITIGATION is not set
@@ -4430,8 +4436,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_LINEAGE=m
@@ -5169,6 +5177,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c250fc6ec..e9e3f27f9 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -962,6 +962,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -2888,6 +2889,7 @@ CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
CONFIG_LOCK_DOWN_KERNEL=y
CONFIG_LOCKD_V4=y
+CONFIG_LOCK_EVENT_COUNTS=y
CONFIG_LOCK_STAT=y
CONFIG_LOCK_TORTURE_TEST=m
CONFIG_LOCKUP_DETECTOR=y
@@ -3163,6 +3165,7 @@ CONFIG_MICROCHIP_PHY=m
# CONFIG_MICROCHIP_T1_PHY is not set
CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_INTEL=y
+# CONFIG_MICROCODE_OLD_INTERFACE is not set
CONFIG_MICROCODE=y
CONFIG_MICROSEMI_PHY=m
CONFIG_MIGRATION=y
@@ -4861,8 +4864,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_K10TEMP=m
@@ -5665,6 +5670,7 @@ CONFIG_TEST_LIST_SORT=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index a37db19bd..1394f7117 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -961,6 +961,7 @@ CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECHAINIV=m
+CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=y
@@ -2869,6 +2870,7 @@ CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set
CONFIG_LOCK_DOWN_KERNEL=y
CONFIG_LOCKD_V4=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_LOCK_TORTURE_TEST is not set
CONFIG_LOCKUP_DETECTOR=y
@@ -3144,6 +3146,7 @@ CONFIG_MICROCHIP_PHY=m
# CONFIG_MICROCHIP_T1_PHY is not set
CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_INTEL=y
+# CONFIG_MICROCODE_OLD_INTERFACE is not set
CONFIG_MICROCODE=y
CONFIG_MICROSEMI_PHY=m
CONFIG_MIGRATION=y
@@ -4841,8 +4844,10 @@ CONFIG_SENSORS_INA209=m
CONFIG_SENSORS_INA2XX=m
CONFIG_SENSORS_INA3221=m
# CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR38064 is not set
# CONFIG_SENSORS_ISL29018 is not set
# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_SENSORS_ISL68137 is not set
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_JC42=m
CONFIG_SENSORS_K10TEMP=m
@@ -5644,6 +5649,7 @@ CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
# CONFIG_TEST_SYSCTL is not set
# CONFIG_TEST_UDELAY is not set
# CONFIG_TEST_USER_COPY is not set
diff --git a/kernel.spec b/kernel.spec
index 9355fdd3f..a5a87a20d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%global released_kernel 1
+%global released_kernel 0
# Sign modules on x86. Make sure the config files match this setting if more
# architectures are added.
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 5.%{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}
@@ -1821,6 +1821,10 @@ fi
#
#
%changelog
+* Tue May 07 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc0.git1.1
+- Linux v5.1-1199-g71ae5fc87c34
+- Reenable debugging options.
+
* Mon May 6 2019 Peter Robinson <pbrobinson@fedoraproject.org>
- Enable Arm STM32MP1
diff --git a/scripts/generate-git-snapshot.sh b/scripts/generate-git-snapshot.sh
index 2ad6a5f06..242200ef6 100755
--- a/scripts/generate-git-snapshot.sh
+++ b/scripts/generate-git-snapshot.sh
@@ -20,7 +20,7 @@ VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed
if [ -z "$VER" ] ;
then
- VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.gz// | sed s/[\(\)]//g)
+ VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz// | sed s/[\(\)]//g)
fi
OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //)
diff --git a/sources b/sources
index ef9e1279c..0bbb02f65 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
+SHA512 (patch-5.1-git1.xz) = 78a0d98cda32d40b46f20a010b414271925171de15ee536f8f49e1426442686dfe7d5d6f8ceea33a236887ebcc71117ca9f159c5968978a99f7649a2fabc636d