diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index e9fc9bc42..575952d83 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2072,7 +2072,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
 # CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 # CONFIG_HID_CMEDIA is not set
@@ -2086,7 +2086,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 480fe5692..b83949e95 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2056,7 +2056,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
 # CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 # CONFIG_HID_CMEDIA is not set
@@ -2070,7 +2070,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 770976ae5..f26b87d2a 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1886,7 +1886,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
 # CONFIG_HID_BETOP_FF is not set
 # CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 # CONFIG_HID_CMEDIA is not set
@@ -1900,7 +1900,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 # CONFIG_HID_ELO is not set
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_FT260 is not set
 # CONFIG_HID_GEMBIRD is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 1f6b2fec5..6c079aa37 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1870,7 +1870,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
 # CONFIG_HID_BETOP_FF is not set
 # CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 # CONFIG_HID_CMEDIA is not set
@@ -1884,7 +1884,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 # CONFIG_HID_ELO is not set
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_FT260 is not set
 # CONFIG_HID_GEMBIRD is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index aa5be0507..254afc523 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1887,7 +1887,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
 # CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CMEDIA=m
@@ -1901,7 +1901,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index d24ca9cca..7e420ec7e 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1871,7 +1871,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
 # CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CMEDIA=m
@@ -1885,7 +1885,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 869b52cb9..8a3928b0f 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1880,7 +1880,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
 # CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CMEDIA=m
@@ -1894,7 +1894,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 6647ebe8d..10a6f5e58 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1995,7 +1995,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
 # CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CMEDIA=m
@@ -2009,7 +2009,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 51c69283b..9e5771ce7 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1979,7 +1979,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
 # CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_BPF is not set
+CONFIG_HID_BPF=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CMEDIA=m
@@ -1993,7 +1993,7 @@ CONFIG_HID_ELAN=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 # CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_EVISION is not set
+CONFIG_HID_EVISION=m
 CONFIG_HID_EZKEY=m
 # CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
diff --git a/kernel.spec b/kernel.spec
index e22a3aeda..c98f37c7c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -141,13 +141,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.3.0
 %define patchversion 6.3
-%define pkgrelease 0.rc1.20230307git8ca09d5fa354.17
+%define pkgrelease 0.rc1.20230308git63355b9884b3.17
 %define kversion 6
-%define tarfile_release 6.3-rc1-2-g8ca09d5fa354
+%define tarfile_release 6.3-rc1-3-g63355b9884b3
 # This is needed to do merge window version magic
 %define patchlevel 3
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20230307git8ca09d5fa354.17%{?buildid}%{?dist}
+%define specrelease 0.rc1.20230308git63355b9884b3.17%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.3.0
 
@@ -726,11 +726,7 @@ BuildRequires: dracut
 BuildRequires: binutils
 # For the initrd
 BuildRequires: lvm2
-%if 0%{?fedora} > 37 || 0%{?rhel} > 9
-# The UKI code was introduced in Fedora 38 and is not needed by earlier
-# versions.  This wrapper can be removed for fedora in Fedora 41.
 BuildRequires: systemd-boot-unsigned
-%endif
 # For systemd-stub and systemd-pcrphase
 BuildRequires: systemd-udev >= 252-1
 # For TPM operations in UKI initramfs
@@ -3364,8 +3360,9 @@ fi
 #
 #
 %changelog
-* Tue Mar 07 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc1.8ca09d5fa354.17]
-- redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency for RHEL (Prarit Bhargava)
+* Wed Mar 08 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc1.63355b9884b3.17]
+- Revert "Merge branch 'systemd-boot-unsigned' into 'os-build'" (Patrick Talbert)
+- Linux v6.3.0-0.rc1.63355b9884b3
 
 * Tue Mar 07 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc1.8ca09d5fa354.16]
 - redhat/Makefile: fix default values for dist-brew's DISTRO and DIST (Íñigo Huguet)
diff --git a/sources b/sources
index 0159f6c29..09ef1f624 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.3-rc1-2-g8ca09d5fa354.tar.xz) = 0fa5cabdda448704af1a4ebeb88e461f39c926e55c85d5d45eee2ba06548ad9270bd48bc6c94cd081bacd4b0edccf1eea05b8f69d59193113d143b28e8dd44f4
-SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = a42db2ef647d6eca2896f2801345e38f643ab01e51b2121f1adea1a81fa0e1957ce376ab2c50624fb6d7818a10356be2d3c883ae7ee6833a7ab90d312955b74e
-SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 9560700ab830ef3f65a7fe0b561b5323b8d8d88054d20436fc679e6b6e6d627f4c71a94161d0187925bb3a357d11b34441672e947da637cdd9dba4728f3c8764
+SHA512 (linux-6.3-rc1-3-g63355b9884b3.tar.xz) = 6e084846e9ea8e00032f7c9ec31a12382aafa1f070c79316cbb502d1c58aed05b46b712cdc10952f867570cafcc19b01de0dd709a9a3448feaeecf5f11f8b90d
+SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 06b4dede4a569e41dd3da0cde6fe2b25805af76bc22c102c1a83e1bffba81ab7a3860bd3f9569030e6f1e1a3166279b358b9423287c8470724314a21fda0f094
+SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 61d7b6c7f501f3b6b936d8cf90dc5fb5c89719bb29e6f2e55d1a1e4858ba1b25e67435625ae4a22439f42a9433818c6825897180e73fd930fb5c4fd1395d5dfe