diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index dc26af4c3..e27f181d4 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1061,6 +1061,8 @@ CONFIG_COMMON_CLK_HI6220=y
 CONFIG_COMMON_CLK_HI655X=m
 CONFIG_COMMON_CLK_MAX77686=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
+CONFIG_COMMON_CLK_MESON_PHASE=y
+CONFIG_COMMON_CLK_MESON_SCLK_DIV=y
 # CONFIG_COMMON_CLK_MMP2_AUDIO is not set
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
@@ -3535,7 +3537,7 @@ CONFIG_MESON_IRQ_GPIO=y
 CONFIG_MESON_SARADC=m
 CONFIG_MESON_SECURE_PM_DOMAINS=y
 CONFIG_MESON_SM=y
-# CONFIG_MESON_WATCHDOG is not set
+CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -5230,6 +5232,7 @@ CONFIG_REALTEK_PHY=y
 # CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SPMI=y
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PG86X is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index afb0e3f83..0d6980a5b 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1061,6 +1061,8 @@ CONFIG_COMMON_CLK_HI6220=y
 CONFIG_COMMON_CLK_HI655X=m
 CONFIG_COMMON_CLK_MAX77686=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
+CONFIG_COMMON_CLK_MESON_PHASE=y
+CONFIG_COMMON_CLK_MESON_SCLK_DIV=y
 # CONFIG_COMMON_CLK_MMP2_AUDIO is not set
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
@@ -3516,7 +3518,7 @@ CONFIG_MESON_IRQ_GPIO=y
 CONFIG_MESON_SARADC=m
 CONFIG_MESON_SECURE_PM_DOMAINS=y
 CONFIG_MESON_SM=y
-# CONFIG_MESON_WATCHDOG is not set
+CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -5211,6 +5213,7 @@ CONFIG_REALTEK_PHY=y
 # CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SPMI=y
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PG86X is not set
diff --git a/kernel.spec b/kernel.spec
index ce3f73cca..d76f762a8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc6.20200721git4fa640dc5230.1
+%global distro_build 0.rc6.20200723gitd15be546031c.1
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -69,13 +69,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.8.0
-%define pkgrelease 0.rc6.20200721git4fa640dc5230.1
+%define pkgrelease 0.rc6.20200723gitd15be546031c.1
 
 # This is needed to do merge window version magic
 %define patchlevel 8
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20200721git4fa640dc5230.1%{?buildid}%{?dist}
+%define specrelease 0.rc6.20200723gitd15be546031c.1%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -567,7 +567,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200721git4fa640dc5230.tar.xz
+Source0: linux-20200723gitd15be546031c.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1308,8 +1308,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20200721git4fa640dc5230 -c
-mv linux-20200721git4fa640dc5230 linux-%{KVERREL}
+%setup -q -n kernel-20200723gitd15be546031c -c
+mv linux-20200723gitd15be546031c linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2846,6 +2846,11 @@ fi
 #
 #
 %changelog
+* Thu Jul 23 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200723gitd15be546031c.1]
+- d15be546031c rebase
+- fedora: arm: Update some meson config options (Peter Robinson)
+- Updated changelog for the release based on 4fa640dc5230 (Fedora Kernel Team)
+
 * Tue Jul 21 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200721git4fa640dc5230.1]
 - 4fa640dc5230 rebase
 - Updated changelog for the release based on 5714ee50bb43 (Fedora Kernel Team)
diff --git a/sources b/sources
index 4318fc977..fe26d9366 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200721git4fa640dc5230.tar.xz) = b632241167a5ea57fcbd5bd6bcde9813d62c00fba8a497e0ed1c0aa61f280784429a884683d2e6536ad01c8714360dcb3a280244ca43ddfd01a7f4b9596b4617
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc6.20200721git4fa640dc5230.1.tar.bz2) = f206b41792efa3cc95cd8a6485588834e95670d892396af17dd6535184bf555fa63d7d06852582b5970d638f2799c4c4f2166953962e38ec8922023d5c37d9bb
-SHA512 (kernel-kabi-dw-5.8.0-0.rc6.20200721git4fa640dc5230.1.tar.bz2) = 6218d8560a20d0bb32d2d1c3f0c804af78c4bf116c2ddccb6deb1483c01f2beb495e114b40a7cf94ca939a19c232ede77b20c32ff45db95be8a47fdbe814d883
+SHA512 (linux-20200723gitd15be546031c.tar.xz) = 1a77b4d21347bcb6c5f615a7c450b159fb6b965e186eadc721a88ca456a834bbe36d014cc8ace89a13a7349eb7d8a79910c168be3f141acb4b1869a5eca52c2a
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc6.20200723gitd15be546031c.1.tar.bz2) = 7c9829a0839a19b36f40365131f1ada54fa89e2e156e9420fe47ecf93a575bdcfc8e65d2cde0e8410b5d3d7b30489993a3ed138d7b941a95b6e0e100a48bd54c
+SHA512 (kernel-kabi-dw-5.8.0-0.rc6.20200723gitd15be546031c.1.tar.bz2) = 7832bbe80f073e91e5478248d9cf121060451b7fa4331d2efc7f0e714023d0201cc6c72f54f6af41cb18bef05905a0d9a8fb1446138e0022e89b093b22a1c5ab