diff --git a/Makefile.rhelver b/Makefile.rhelver
index d93ab4b92..92aed85ff 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 = 17
+RHEL_RELEASE = 18
 
 #
 # ZSTREAM
diff --git a/generate_all_configs.sh b/generate_all_configs.sh
index 099d9aada..13f4e1c8e 100755
--- a/generate_all_configs.sh
+++ b/generate_all_configs.sh
@@ -19,18 +19,19 @@ else
 	SECONDARY=fedora
 fi
 
-for i in kernel-*-"$FLAVOR".config; do
-	NEW=kernel-"$SPECVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//)
-	#echo $NEW
+# The +1 is to remove the - at the end of the SPECPACKAGE_NAME string
+specpackage_name_len=$((${#SPECPACKAGE_NAME} + 1))
+for i in ${SPECPACKAGE_NAME}*-"$FLAVOR".config; do
+	NEW=${SPECPACKAGE_NAME}-"$SPECVERSION"-$(echo ${i:$specpackage_name_len} | sed s/-"$FLAVOR"//)
 	mv "$i" "$NEW"
 done
 
 rm -f kernel-*-"$SECONDARY".config
 
 if [ "$DEBUGBUILDSENABLED" -eq 0 ]; then
-	for i in kernel-*debug*.config; do
+	for i in ${SPECPACKAGE_NAME}-*debug*.config; do
 		base=$(echo "$i" | sed -r s/-?debug//g)
-		NEW=kernel-$(echo "$base" | cut -d - -f2-)
+		NEW=${SPECPACKAGE_NAME}-$(echo "$base" | cut -d - -f2-)
 		mv "$i" "$NEW"
 	done
 fi
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 90df3fdc4..b70972282 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -9105,7 +9105,7 @@ CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_IOMMU=y
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 05cedcee3..6fff419f9 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -9082,7 +9082,7 @@ CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_IOMMU=y
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 836e42a4e..dedbf83b3 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -9187,7 +9187,7 @@ CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index d1e87b2ba..9548a6b01 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -9166,7 +9166,7 @@ CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 6c5d0a07c..37e62d62e 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -8936,7 +8936,7 @@ CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 246edc62e..d01e20a71 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -8915,7 +8915,7 @@ CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 8aeafac28..3bf8bbb02 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -7665,7 +7665,7 @@ CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 7013fe173..fca33d8ca 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -7642,7 +7642,7 @@ CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 24a5b6091..9f8a8abf9 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -7616,7 +7616,7 @@ CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 4bf1ade45..a0babd143 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -7593,7 +7593,7 @@ CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 80da95b15..915562e58 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -8084,7 +8084,7 @@ CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_IOMMU=y
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index a839c0752..ab0064219 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -8062,7 +8062,7 @@ CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_IOMMU=y
 CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_MMIO=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI_LEGACY=y
diff --git a/kernel.spec b/kernel.spec
index c98f37c7c..9bb94b986 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -120,6 +120,8 @@ Summary: The Linux kernel
 # genspec.sh variables
 #
 
+# kernel package name
+%global package_name kernel
 # Include Fedora files
 %global include_fedora 1
 # Include RHEL files
@@ -141,13 +143,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.3.0
 %define patchversion 6.3
-%define pkgrelease 0.rc1.20230308git63355b9884b3.17
+%define pkgrelease 0.rc1.20230309git6a98c9cae232.18
 %define kversion 6
-%define tarfile_release 6.3-rc1-3-g63355b9884b3
+%define tarfile_release 6.3-rc1-19-g6a98c9cae232
 # 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.20230308git63355b9884b3.17%{?buildid}%{?dist}
+%define specrelease 0.rc1.20230309git6a98c9cae232.18%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.3.0
 
@@ -425,7 +427,7 @@ Summary: The Linux kernel
 %define with_bpftool 0
 %define with_selftests 0
 %define with_debug 0
-%define all_arch_configs kernel-%{version}-*.config
+%define all_arch_configs %{name}-%{version}-*.config
 %endif
 
 # sparse blows up on ppc
@@ -448,13 +450,13 @@ Summary: The Linux kernel
 %ifarch i686
 %define asmarch x86
 %define hdrarch i386
-%define all_arch_configs kernel-%{version}-i?86*.config
+%define all_arch_configs %{name}-%{version}-i?86*.config
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
 %ifarch x86_64
 %define asmarch x86
-%define all_arch_configs kernel-%{version}-x86_64*.config
+%define all_arch_configs %{name}-%{version}-x86_64*.config
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
@@ -465,19 +467,19 @@ Summary: The Linux kernel
 %define kernel_image vmlinux
 %define kernel_image_elf 1
 %define use_vdso 0
-%define all_arch_configs kernel-%{version}-ppc64le*.config
+%define all_arch_configs %{name}-%{version}-ppc64le*.config
 %endif
 
 %ifarch s390x
 %define asmarch s390
 %define hdrarch s390
-%define all_arch_configs kernel-%{version}-s390x.config
+%define all_arch_configs %{name}-%{version}-s390x.config
 %define kernel_image arch/s390/boot/bzImage
 %define vmlinux_decompressor arch/s390/boot/vmlinux
 %endif
 
 %ifarch %{arm}
-%define all_arch_configs kernel-%{version}-arm*.config
+%define all_arch_configs %{name}-%{version}-arm*.config
 %define skip_nonpae_vdso 1
 %define asmarch arm
 %define hdrarch arm
@@ -496,7 +498,7 @@ Summary: The Linux kernel
 %endif
 
 %ifarch aarch64
-%define all_arch_configs kernel-%{version}-aarch64*.config
+%define all_arch_configs %{name}-%{version}-aarch64*.config
 %define asmarch arm64
 %define hdrarch arm64
 %define make_target vmlinuz.efi
@@ -576,7 +578,7 @@ Summary: The Linux kernel
 %define initrd_prereq  dracut >= 027
 
 
-Name: kernel
+Name: %{package_name}
 License: GPLv2 and Redistributable, no modification permitted
 URL: https://www.kernel.org/
 Version: %{specversion}
@@ -804,17 +806,17 @@ Source21: mod-sign.sh
 %if 0%{?include_rhel}
 Source23: x509.genkey.rhel
 
-Source24: kernel-aarch64-rhel.config
-Source25: kernel-aarch64-debug-rhel.config
+Source24: %{name}-aarch64-rhel.config
+Source25: %{name}-aarch64-debug-rhel.config
 Source26: mod-extra.list.rhel
 
-Source27: kernel-ppc64le-rhel.config
-Source28: kernel-ppc64le-debug-rhel.config
-Source29: kernel-s390x-rhel.config
-Source30: kernel-s390x-debug-rhel.config
-Source31: kernel-s390x-zfcpdump-rhel.config
-Source32: kernel-x86_64-rhel.config
-Source33: kernel-x86_64-debug-rhel.config
+Source27: %{name}-ppc64le-rhel.config
+Source28: %{name}-ppc64le-debug-rhel.config
+Source29: %{name}-s390x-rhel.config
+Source30: %{name}-s390x-debug-rhel.config
+Source31: %{name}-s390x-zfcpdump-rhel.config
+Source32: %{name}-x86_64-rhel.config
+Source33: %{name}-x86_64-debug-rhel.config
 
 Source34: filter-x86_64.sh.rhel
 Source35: filter-armv7hl.sh.rhel
@@ -830,18 +832,18 @@ Source41: x509.genkey.centos
 Source50: x509.genkey.fedora
 Source51: mod-extra.list.fedora
 
-Source52: kernel-aarch64-fedora.config
-Source53: kernel-aarch64-debug-fedora.config
-Source54: kernel-armv7hl-fedora.config
-Source55: kernel-armv7hl-debug-fedora.config
-Source56: kernel-armv7hl-lpae-fedora.config
-Source57: kernel-armv7hl-lpae-debug-fedora.config
-Source60: kernel-ppc64le-fedora.config
-Source61: kernel-ppc64le-debug-fedora.config
-Source62: kernel-s390x-fedora.config
-Source63: kernel-s390x-debug-fedora.config
-Source64: kernel-x86_64-fedora.config
-Source65: kernel-x86_64-debug-fedora.config
+Source52: %{name}-aarch64-fedora.config
+Source53: %{name}-aarch64-debug-fedora.config
+Source54: %{name}-armv7hl-fedora.config
+Source55: %{name}-armv7hl-debug-fedora.config
+Source56: %{name}-armv7hl-lpae-fedora.config
+Source57: %{name}-armv7hl-lpae-debug-fedora.config
+Source60: %{name}-ppc64le-fedora.config
+Source61: %{name}-ppc64le-debug-fedora.config
+Source62: %{name}-s390x-fedora.config
+Source63: %{name}-s390x-debug-fedora.config
+Source64: %{name}-x86_64-fedora.config
+Source65: %{name}-x86_64-debug-fedora.config
 
 Source67: filter-x86_64.sh.fedora
 Source68: filter-armv7hl.sh.fedora
@@ -1570,13 +1572,13 @@ mkdir configs
 cd configs
 
 # Drop some necessary files from the source dir into the buildroot
-cp $RPM_SOURCE_DIR/kernel-*.config .
+cp $RPM_SOURCE_DIR/%{name}-*.config .
 cp %{SOURCE80} .
 # merge.py
 cp %{SOURCE3000} .
 # kernel-local
 cp %{SOURCE3001} .
-FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled}
 
 # Merge in any user-provided local config option changes
 %ifnarch %nobuildarches
@@ -1634,7 +1636,7 @@ for opt in %{clang_make_opts}; do
   OPTS="$OPTS -m $opt"
 done
 %endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion}
+RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=%{name} ./process_configs.sh $OPTS ${specversion}
 
 cp %{SOURCE82} .
 RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -1699,7 +1701,7 @@ InitBuildVars() {
     Variant=$1
 
     # Pick the right kernel config file
-    Config=kernel-%{version}-%{_target_cpu}${Variant:+-${Variant}}.config
+    Config=%{name}-%{version}-%{_target_cpu}${Variant:+-${Variant}}.config
     DevelDir=/usr/src/kernels/%{KVERREL}${Variant:++${Variant}}
 
     KernelVer=%{version}-%{release}.%{_target_cpu}${Variant:++${Variant}}
@@ -3360,6 +3362,17 @@ fi
 #
 #
 %changelog
+* Thu Mar 09 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc1.6a98c9cae232.18]
+- redhat/self-test: Update self-test data (Prarit Bhargava)
+- redhat/kernel.spec.template: Fix hardcoded "kernel" (Prarit Bhargava)
+- redhat/configs/generate_all_configs.sh: Fix config naming (Prarit Bhargava)
+- redhat/kernel.spec.template: Pass SPECPACKAGE_NAME to generate_all_configs.sh (Prarit Bhargava)
+- kernel.spec.template: Use SPECPACKAGE_NAME (Prarit Bhargava)
+- redhat/Makefile: Copy spec file (Prarit Bhargava)
+- redhat: Change PACKAGE_NAME to SPECPACKAGE_NAME (Prarit Bhargava)
+- redhat/configs: Support the virtio_mmio.device parameter in Fedora (David Michael)
+- Linux v6.3.0-0.rc1.6a98c9cae232
+
 * 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
diff --git a/process_configs.sh b/process_configs.sh
index b7bce2454..12edf0a5f 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -193,7 +193,7 @@ function commit_new_configs()
 	# assume we are in $source_tree/configs, need to get to top level
 	pushd "$(switch_to_toplevel)" &>/dev/null
 
-	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
+	for cfg in "$SCRIPT_DIR/${SPECPACKAGE_NAME}${KVERREL}"*.config
 	do
 		arch=$(head -1 "$cfg" | cut -b 3-)
 		cfgtmp="${cfg}.tmp"
@@ -304,7 +304,7 @@ function process_configs()
 	[ -f .mismatches ] && rm -f .mismatches
 
 	count=0
-	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
+	for cfg in "$SCRIPT_DIR/${SPECPACKAGE_NAME}${KVERREL}"*.config
 	do
 		if [ "$count" -eq 0 ]; then
 			# do the first one by itself so that tools are built
diff --git a/sources b/sources
index 09ef1f624..f1d832c82 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-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
+SHA512 (linux-6.3-rc1-19-g6a98c9cae232.tar.xz) = e993efb2bbc61633e931e5d727bc1e1fbc1ae4dbf4e045287c08e1913ace1789d8c921386fb5220022a2047d9b0385b48c67b08ff12103c38974662a2467fd20
+SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 2a6a3985d18edf3c66c4711bd51af19a3511d1b3ae60d7c2c1fda78fe29b04f1e6a28277ac7b4f09be06a7ed0e6a6ce9cc3b8ce43f852bbefbae222e793c5bb6
+SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 9af15ce8a470302bc326398eda6578b4f0422ff788e39bd4b0d3ca96ec662ec264b09ae8acc7d15a8821c5cc422c56c3e066396597c6b1bf38ebc042e0f32315