summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-08-11 07:16:50 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-08-11 07:16:50 +0200
commitfb4522c36eff59e3ab46c6e99ae6fb1da7456c5d (patch)
treefe9ff9003c8d6bb0a49647fea5424f00a04c330c
parent6e985586a0fb2d3d024da400e685e8576e4dd284 (diff)
parent5a12ab721169990797a927aa64d94209fe679bbe (diff)
downloadkernel-fb4522c36eff59e3ab46c6e99ae6fb1da7456c5d.tar.gz
kernel-fb4522c36eff59e3ab46c6e99ae6fb1da7456c5d.tar.xz
kernel-fb4522c36eff59e3ab46c6e99ae6fb1da7456c5d.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc5.20210810git9a73fa375d58.43.vanilla.1.fc34
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog7
-rw-r--r--kernel-aarch64-debug-fedora.config4
-rw-r--r--kernel-aarch64-debug-rhel.config4
-rw-r--r--kernel-aarch64-fedora.config4
-rw-r--r--kernel-aarch64-rhel.config4
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-i686-debug-fedora.config13
-rw-r--r--kernel-i686-fedora.config13
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-debug-rhel.config6
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-ppc64le-rhel.config6
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-fedora.config13
-rw-r--r--kernel-x86_64-debug-rhel.config2
-rw-r--r--kernel-x86_64-fedora.config13
-rw-r--r--kernel-x86_64-rhel.config2
-rwxr-xr-xkernel.spec24
-rw-r--r--patch-5.14.0-redhat.patch15
-rw-r--r--sources7
28 files changed, 93 insertions, 68 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index a50c7140f..a24830344 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 42
+RHEL_RELEASE = 43
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 16cb41e31..8f6299b20 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,8 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/c9d32e7b2e03eacf36f7a05ad68ca92dada6fd1f
- c9d32e7b2e03eacf36f7a05ad68ca92dada6fd1f pinctrl: tigerlake: Fix GPIO mapping for newer version of software
+https://gitlab.com/cki-project/kernel-ark/-/commit/98b8c823dd9a61ee01ddba1669a2809cd6725935
+ 98b8c823dd9a61ee01ddba1669a2809cd6725935 pinctrl: tigerlake: Fix GPIO mapping for newer version of software
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/a34f0f1fdb553a2d11a5220c9e417e3d9d96ee43
+ a34f0f1fdb553a2d11a5220c9e417e3d9d96ee43 Revert "ice: mark driver as tech-preview"
https://gitlab.com/cki-project/kernel-ark/-/commit/42130f93b60c5e750ed179c98da57046ea298c54
42130f93b60c5e750ed179c98da57046ea298c54 Revert "Drop that for now"
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index eefe31fa1..185abe483 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3599,7 +3599,7 @@ CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -8308,7 +8308,7 @@ CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_FS=m
CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_IOMMU=m
+CONFIG_VIRTIO_IOMMU=y
CONFIG_VIRTIO_MENU=y
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_MMIO=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 3c350f300..d464705da 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2898,7 +2898,7 @@ CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -6575,7 +6575,7 @@ CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_FS=m
CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_IOMMU=m
+CONFIG_VIRTIO_IOMMU=y
CONFIG_VIRTIO_MENU=y
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_MMIO=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index f40b16e00..dfddc37ea 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -3577,7 +3577,7 @@ CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -8283,7 +8283,7 @@ CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_FS=m
CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_IOMMU=m
+CONFIG_VIRTIO_IOMMU=y
CONFIG_VIRTIO_MENU=y
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_MMIO=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index d87f59a8a..cfb9c06e8 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2878,7 +2878,7 @@ CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -6552,7 +6552,7 @@ CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_FS=m
CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_IOMMU=m
+CONFIG_VIRTIO_IOMMU=y
CONFIG_VIRTIO_MENU=y
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_MMIO=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 9272f89d4..ddd8bb81d 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -3636,7 +3636,7 @@ CONFIG_LMP91000=m
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index b018b367f..67657e26d 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -3615,7 +3615,7 @@ CONFIG_LMP91000=m
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 0f369a6e1..b984e8665 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -3562,7 +3562,7 @@ CONFIG_LMP91000=m
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index ea0971b35..7e9b026e6 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -3541,7 +3541,7 @@ CONFIG_LMP91000=m
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 30d10f68f..e6465c04f 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -2025,6 +2025,7 @@ CONFIG_GPIO_AGGREGATOR=m
# CONFIG_GPIO_AMD8111 is not set
CONFIG_GPIO_AMD_FCH=m
CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_ARIZONA=m
# CONFIG_GPIO_BCM_XGS_IPROC is not set
CONFIG_GPIO_BD9571MWV=m
CONFIG_GPIO_CADENCE=m
@@ -2574,6 +2575,7 @@ CONFIG_INOTIFY_USER=y
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_ADXL34X is not set
CONFIG_INPUT_APANEL=m
+# CONFIG_INPUT_ARIZONA_HAPTICS is not set
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -3256,7 +3258,7 @@ CONFIG_LMP91000=m
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -3459,8 +3461,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_ACT8945A is not set
# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_SPI=m
# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
@@ -3475,6 +3476,7 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_CS47L24 is not set
CONFIG_MFD_CS5535=y
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3566,11 +3568,14 @@ CONFIG_MFD_VX855=m
# CONFIG_MFD_WCD934X is not set
CONFIG_MFD_WL1273_CORE=m
CONFIG_MFD_WM5102=y
+# CONFIG_MFD_WM5110 is not set
# CONFIG_MFD_WM831X_I2C is not set
# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_WM8997 is not set
+# CONFIG_MFD_WM8998 is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
# CONFIG_MHI_BUS_DEBUG is not set
@@ -5057,6 +5062,8 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index a7847a2c2..8e73eae49 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -2008,6 +2008,7 @@ CONFIG_GPIO_AGGREGATOR=m
# CONFIG_GPIO_AMD8111 is not set
CONFIG_GPIO_AMD_FCH=m
CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_ARIZONA=m
# CONFIG_GPIO_BCM_XGS_IPROC is not set
CONFIG_GPIO_BD9571MWV=m
CONFIG_GPIO_CADENCE=m
@@ -2557,6 +2558,7 @@ CONFIG_INOTIFY_USER=y
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_ADXL34X is not set
CONFIG_INPUT_APANEL=m
+# CONFIG_INPUT_ARIZONA_HAPTICS is not set
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -3234,7 +3236,7 @@ CONFIG_LMP91000=m
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -3437,8 +3439,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_ACT8945A is not set
# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_SPI=m
# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
@@ -3453,6 +3454,7 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_CS47L24 is not set
CONFIG_MFD_CS5535=y
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3544,11 +3546,14 @@ CONFIG_MFD_VX855=m
# CONFIG_MFD_WCD934X is not set
CONFIG_MFD_WL1273_CORE=m
CONFIG_MFD_WM5102=y
+# CONFIG_MFD_WM5110 is not set
# CONFIG_MFD_WM831X_I2C is not set
# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_WM8997 is not set
+# CONFIG_MFD_WM8998 is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
# CONFIG_MHI_BUS_DEBUG is not set
@@ -5035,6 +5040,8 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9121 is not set
# CONFIG_REGULATOR_DA9210 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index aa7d46ae5..d17bb351b 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -3018,7 +3018,7 @@ CONFIG_LOAD_PPC_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 874a4ec01..710a82887 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1646,7 +1646,7 @@ CONFIG_GCC_PLUGINS=y
# CONFIG_GEMINI_ETHERNET is not set
# CONFIG_GENERIC_ADC_BATTERY is not set
# CONFIG_GENERIC_ADC_THERMAL is not set
-CONFIG_GENERIC_CPU=y
+# CONFIG_GENERIC_CPU is not set
CONFIG_GENERIC_IRQ_DEBUGFS=y
# CONFIG_GENERIC_PHY is not set
CONFIG_GENEVE=m
@@ -2728,7 +2728,7 @@ CONFIG_LOAD_PPC_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -4038,7 +4038,7 @@ CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
+CONFIG_POWER9_CPU=y
# CONFIG_POWERCAP is not set
CONFIG_POWERNV_CPUFREQ=y
CONFIG_POWERNV_CPUIDLE=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index a1b3c027f..b586722d8 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2996,7 +2996,7 @@ CONFIG_LOAD_PPC_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index f116ec896..832c6ba53 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1630,7 +1630,7 @@ CONFIG_GCC_PLUGINS=y
# CONFIG_GEMINI_ETHERNET is not set
# CONFIG_GENERIC_ADC_BATTERY is not set
# CONFIG_GENERIC_ADC_THERMAL is not set
-CONFIG_GENERIC_CPU=y
+# CONFIG_GENERIC_CPU is not set
# CONFIG_GENERIC_IRQ_DEBUGFS is not set
# CONFIG_GENERIC_PHY is not set
CONFIG_GENEVE=m
@@ -2711,7 +2711,7 @@ CONFIG_LOAD_PPC_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -4021,7 +4021,7 @@ CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
-# CONFIG_POWER9_CPU is not set
+CONFIG_POWER9_CPU=y
# CONFIG_POWERCAP is not set
CONFIG_POWERNV_CPUFREQ=y
CONFIG_POWERNV_CPUIDLE=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index f1b225521..536323e75 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2993,7 +2993,7 @@ CONFIG_LOAD_IPL_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 2f80231f1..739b9c66c 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2706,7 +2706,7 @@ CONFIG_LOAD_IPL_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 9eeb88416..f0d6bec36 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2971,7 +2971,7 @@ CONFIG_LOAD_IPL_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 852752021..bb60cd9a8 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2689,7 +2689,7 @@ CONFIG_LOAD_IPL_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 2c89adaf7..a6cba4497 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2707,7 +2707,7 @@ CONFIG_LOAD_IPL_KEYS=y
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
# CONFIG_LOCKDEP is not set
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index d8862bd19..429d01cef 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2065,6 +2065,7 @@ CONFIG_GPIO_AGGREGATOR=m
# CONFIG_GPIO_AMD8111 is not set
CONFIG_GPIO_AMD_FCH=m
CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_ARIZONA=m
# CONFIG_GPIO_BCM_XGS_IPROC is not set
CONFIG_GPIO_BD9571MWV=m
CONFIG_GPIO_CADENCE=m
@@ -2621,6 +2622,7 @@ CONFIG_INOTIFY_USER=y
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_ADXL34X is not set
CONFIG_INPUT_APANEL=m
+# CONFIG_INPUT_ARIZONA_HAPTICS is not set
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -3312,7 +3314,7 @@ CONFIG_LMP91000=m
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -3509,8 +3511,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_ACT8945A is not set
# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_SPI=m
# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
@@ -3526,6 +3527,7 @@ CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_CS47L24 is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3617,11 +3619,14 @@ CONFIG_MFD_VX855=m
# CONFIG_MFD_WCD934X is not set
CONFIG_MFD_WL1273_CORE=m
CONFIG_MFD_WM5102=y
+# CONFIG_MFD_WM5110 is not set
# CONFIG_MFD_WM831X_I2C is not set
# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_WM8997 is not set
+# CONFIG_MFD_WM8998 is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
# CONFIG_MHI_BUS_DEBUG is not set
@@ -5100,6 +5105,8 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
# CONFIG_REGULATOR_AXP20X is not set
# CONFIG_REGULATOR_BD9571MWV is not set
# CONFIG_REGULATOR_DA9121 is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 1d36f5642..6a6bc3db1 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -2912,7 +2912,7 @@ CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 1194c2a29..5f9019b1b 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2048,6 +2048,7 @@ CONFIG_GPIO_AGGREGATOR=m
# CONFIG_GPIO_AMD8111 is not set
CONFIG_GPIO_AMD_FCH=m
CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_ARIZONA=m
# CONFIG_GPIO_BCM_XGS_IPROC is not set
CONFIG_GPIO_BD9571MWV=m
CONFIG_GPIO_CADENCE=m
@@ -2604,6 +2605,7 @@ CONFIG_INOTIFY_USER=y
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_ADXL34X is not set
CONFIG_INPUT_APANEL=m
+# CONFIG_INPUT_ARIZONA_HAPTICS is not set
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_ATLAS_BTNS=m
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -3290,7 +3292,7 @@ CONFIG_LMP91000=m
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
@@ -3487,8 +3489,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_ACT8945A is not set
# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_SPI=m
# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_MFD_ASIC3 is not set
@@ -3504,6 +3505,7 @@ CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_DEV=m
# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_CS47L24 is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -3595,11 +3597,14 @@ CONFIG_MFD_VX855=m
# CONFIG_MFD_WCD934X is not set
CONFIG_MFD_WL1273_CORE=m
CONFIG_MFD_WM5102=y
+# CONFIG_MFD_WM5110 is not set
# CONFIG_MFD_WM831X_I2C is not set
# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_WM8997 is not set
+# CONFIG_MFD_WM8998 is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
# CONFIG_MHI_BUS_DEBUG is not set
@@ -5078,6 +5083,8 @@ CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PG86X is not set
# CONFIG_REGULATOR_ACT8865 is not set
# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
# CONFIG_REGULATOR_AXP20X is not set
# CONFIG_REGULATOR_BD9571MWV is not set
# CONFIG_REGULATOR_DA9121 is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 42ed082c6..6ede7f159 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -2893,7 +2893,7 @@ CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKDEP_BITS=16
-CONFIG_LOCKDEP_CHAINS_BITS=16
+CONFIG_LOCKDEP_CHAINS_BITS=17
CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
CONFIG_LOCKDEP_STACK_TRACE_BITS=19
CONFIG_LOCKDEP_STACK_TRACE_HASH_BITS=14
diff --git a/kernel.spec b/kernel.spec
index 70c0518f6..d519a8014 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -78,9 +78,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
-%global distro_build 0.rc5.42
+%global distro_build 0.rc5.20210810git9a73fa375d58.43
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -126,13 +126,13 @@ Summary: The Linux kernel
%define kversion 5.14
%define rpmversion 5.14.0
-%define pkgrelease 0.rc5.42
+%define pkgrelease 0.rc5.20210810git9a73fa375d58.43
# This is needed to do merge window version magic
%define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.42%{?buildid}%{?dist}
+%define specrelease 0.rc5.20210810git9a73fa375d58.43%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -673,7 +673,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.14-rc5.tar.xz
+Source0: linux-5.14-rc5-2-g9a73fa375d58.tar.xz
Source1: Makefile.rhelver
@@ -1359,8 +1359,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.14-rc5 -c
-mv linux-5.14-rc5 linux-%{KVERREL}
+%setup -q -n kernel-5.14-rc5-2-g9a73fa375d58 -c
+mv linux-5.14-rc5-2-g9a73fa375d58 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2958,9 +2958,17 @@ fi
#
#
%changelog
-* Mon Aug 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc5.42]
+* Tue Aug 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc5.20210810git9a73fa375d58.43]
- pinctrl: tigerlake: Fix GPIO mapping for newer version of software (Andy Shevchenko)
+* Tue Aug 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc5.20210810git9a73fa375d58.42]
+- redhat/configs/evaluate_configs: Update help output (Prarit Bhargava)
+- redhat/configs: Double MAX_LOCKDEP_CHAINS (Justin M. Forbes)
+- fedora: configs: Fix WM5102 Kconfig (Hans de Goede)
+- powerpc: enable CONFIG_POWER9_CPU (Diego Domingos) [1876436]
+- redhat/configs: Fix CONFIG_VIRTIO_IOMMU to 'y' on aarch64 (Eric Auger) [1972795]
+- Revert "ice: mark driver as tech-preview" (Jonathan Toppins)
+
* Thu Aug 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc4.20210805git251a1524293d.37]
- common: Update for CXL (Compute Express Link) configs (Peter Robinson)
- redhat: configs: disable CRYPTO_SM modules (Herton R. Krzesinski) [1990040]
diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch
index e41bf85c5..2f7f937d4 100644
--- a/patch-5.14.0-redhat.patch
+++ b/patch-5.14.0-redhat.patch
@@ -26,7 +26,6 @@
drivers/iommu/iommu.c | 22 +
drivers/message/fusion/mptsas.c | 10 +
drivers/message/fusion/mptspi.c | 11 +
- drivers/net/ethernet/intel/ice/ice_main.c | 1 +
drivers/net/team/team.c | 2 +
drivers/net/wireguard/main.c | 7 +
drivers/nvme/host/core.c | 22 +-
@@ -82,7 +81,7 @@
tools/testing/selftests/bpf/progs/linked_maps2.c | 76 ---
tools/testing/selftests/bpf/progs/linked_vars1.c | 54 --
tools/testing/selftests/bpf/progs/linked_vars2.c | 55 ---
- 84 files changed, 1168 insertions(+), 1505 deletions(-)
+ 83 files changed, 1167 insertions(+), 1505 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index bdb22006f713..61a3a4a4730b 100644
@@ -1233,18 +1232,6 @@ index af0ce5611e4a..1c226920c12d 100644
return 0;
out_mptspi_probe:
-diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
-index ef8d1815af56..702abf98c068 100644
---- a/drivers/net/ethernet/intel/ice/ice_main.c
-+++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -5063,6 +5063,7 @@ static int __init ice_module_init(void)
-
- pr_info("%s\n", ice_driver_string);
- pr_info("%s\n", ice_copyright);
-+ mark_tech_preview(DRV_SUMMARY, THIS_MODULE);
-
- ice_wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, KBUILD_MODNAME);
- if (!ice_wq) {
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index dd7917cab2b1..f6b43adb2ced 100644
--- a/drivers/net/team/team.c
diff --git a/sources b/sources
index 8b7bbddcd..53e0f5a36 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8
-SHA512 (linux-5.14-rc5.tar.xz) = ad578a0f4454e4e9e5838fb62f7364b08922c92e99c903b683680510eea4a6916b588220d965057425e312bc919c2ff7f6f7b79564e9bef79dd97d9a6759b3ee
-SHA512 (kernel-abi-stablelists-5.14.0-0.rc5.42.tar.bz2) = b40af9144ca0d9c9752073c430e306c7335ebc551bcb2f70598306cd9a7a088f74115a71047a5ffd48112a4eb9d23053d0378c921026b90fd1f3b8f08629214c
-SHA512 (kernel-kabi-dw-5.14.0-0.rc5.42.tar.bz2) = 03a827c1484ed6df7712223d3d500bdd33c089eee9844687ef7d8e56da7b063fcfaed151d0b12fffdb0b1ac74f7e02fb97822a4f40ba4a5b782c648de33325b9
+SHA512 (linux-5.14-rc5-2-g9a73fa375d58.tar.xz) = 3859e2ecf0dbc7c883f1362115c5e96d6af01e4f3d384ac986f311d82a5bd025618178d748c4393b303471bc887609395148ba65c6c0ae6e5d57c681c220f514
+SHA512 (kernel-abi-stablelists-5.14.0-0.rc5.20210810git9a73fa375d58.43.tar.bz2) = 4a6279a4676885f49769943b3d9b708762abb4518ca0987562c330c39367774d4a3eb57a647c6d308e23a42b54c40b62e2d036a8e40d261895ab8638cfdee65c
+SHA512 (kernel-kabi-dw-5.14.0-0.rc5.20210810git9a73fa375d58.43.tar.bz2) = 7cdd3077fc8501fc38b61630c71be8a073b6d220e68db6a1470fe505fdd5b2531a1cf4f16a14a7363c9f06d49eb2558faf2efffa72497ef68ea37fa80b95f464