diff --git a/Makefile.rhelver b/Makefile.rhelver
index 943e2e14a..23c59cd4f 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 = 49
+RHEL_RELEASE = 50
 
 #
 # RHEL_REBASE_NUM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index a7964dcda..42b6b4aa8 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/aee04731d0904833c3cfaded90144103c7001407
+ aee04731d0904833c3cfaded90144103c7001407 tools/resolve_btfids: Fix setting HOSTCFLAGS
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/a880b0fb1a4b0e1526d80c3dc4555eb09d688d46
  a880b0fb1a4b0e1526d80c3dc4555eb09d688d46 Enable IO_URING for RHEL
 
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index e06793d22..a05ec08f4 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2583,8 +2583,8 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
-CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_STACK_ALL_ZERO=y
+# CONFIG_INIT_STACK_NONE is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index b0d87824f..1de17c273 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2567,8 +2567,8 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
-CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_STACK_ALL_ZERO=y
+# CONFIG_INIT_STACK_NONE is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 0b6369bdd..db6e16c3e 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -2314,8 +2314,8 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
-CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_STACK_ALL_ZERO=y
+# CONFIG_INIT_STACK_NONE is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index bdd0ac3f6..5ade64efd 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -2298,8 +2298,8 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
-CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_STACK_ALL_ZERO=y
+# CONFIG_INIT_STACK_NONE is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index ca2b960d5..26a21a854 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2300,8 +2300,8 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
-CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_STACK_ALL_ZERO=y
+# CONFIG_INIT_STACK_NONE is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index e2cb60e3a..3660e5fd3 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -2284,8 +2284,8 @@ CONFIG_INFINIBAND_USNIC=m
 # CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
-CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_STACK_ALL_ZERO=y
+# CONFIG_INIT_STACK_NONE is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 17d554461..6e3db192e 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2295,8 +2295,8 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
-CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_STACK_ALL_ZERO=y
+# CONFIG_INIT_STACK_NONE is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 48b2be5f9..d2813d5ab 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -2447,8 +2447,8 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
-CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_STACK_ALL_ZERO=y
+# CONFIG_INIT_STACK_NONE is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 1e1eb9ac1..892896ab3 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -2431,8 +2431,8 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 # CONFIG_INITRAMFS_PRESERVE_MTIME is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-# CONFIG_INIT_STACK_ALL_ZERO is not set
-CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_STACK_ALL_ZERO=y
+# CONFIG_INIT_STACK_NONE is not set
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ADXL34X is not set
diff --git a/kernel.spec b/kernel.spec
index 0f9a1f067..004a6595e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -148,13 +148,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.4.0
 %define specversion 6.4.0
 %define patchversion 6.4
-%define pkgrelease 0.rc6.20230614gitb6dad5178cea.49
+%define pkgrelease 0.rc6.20230616git40f71e7cd3c6.50
 %define kversion 6
-%define tarfile_release 6.4-rc6-37-gb6dad5178cea
+%define tarfile_release 6.4-rc6-195-g40f71e7cd3c6
 # This is needed to do merge window version magic
 %define patchlevel 4
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20230614gitb6dad5178cea.49%{?buildid}%{?dist}
+%define specrelease 0.rc6.20230616git40f71e7cd3c6.50%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.4.0
 
@@ -2073,7 +2073,8 @@ BuildKernel() {
     cp --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp --parents tools/objtool/sync-check.sh $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
-    cp -a --parents tools/bpf/resolve_btfids $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+    cp -a --parents tools/bpf/resolve_btfids/main.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+    cp -a --parents tools/bpf/resolve_btfids/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
 
     cp --parents security/selinux/include/policycap_names.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp --parents security/selinux/include/policycap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
@@ -3436,6 +3437,13 @@ fi
 #
 #
 %changelog
+* Fri Jun 16 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc6.40f71e7cd3c6.50]
+- spec: remove resolve_btfids from kernel-devel (Viktor Malik)
+- tools/resolve_btfids: Fix setting HOSTCFLAGS (Viktor Malik)
+- Fix typo in filter-modules (Justin M. Forbes)
+- redhat/configs: Enable CONFIG_INIT_STACK_ALL_ZERO for RHEL (Josh Poimboeuf)
+- Linux v6.4.0-0.rc6.40f71e7cd3c6
+
 * Wed Jun 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc6.b6dad5178cea.49]
 - Remove CONFIG_ARCH_FORCE_MAX_ORDER for aarch64 (Justin M. Forbes)
 - Fix up config and filter for PTP_DFL_TOD (Justin M. Forbes)
diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch
index 9486c0fd9..17fe87fae 100644
--- a/patch-6.4-redhat.patch
+++ b/patch-6.4-redhat.patch
@@ -61,7 +61,8 @@
  security/lockdown/Kconfig                          |  13 +
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |  12 +
- 63 files changed, 1542 insertions(+), 188 deletions(-)
+ tools/bpf/resolve_btfids/Makefile                  |   4 +-
+ 64 files changed, 1544 insertions(+), 190 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
 index 9e5bab29685f..223901a42a15 100644
@@ -2967,3 +2968,25 @@ index d5ff7ff45b77..ac7d177a5fea 100644
  #ifdef CONFIG_PERF_EVENTS
  /**
   * security_perf_event_open() - Check if a perf event open is allowed
+diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile
+index ac548a7baa73..4b8079f294f6 100644
+--- a/tools/bpf/resolve_btfids/Makefile
++++ b/tools/bpf/resolve_btfids/Makefile
+@@ -67,7 +67,7 @@ $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OU
+ LIBELF_FLAGS := $(shell $(HOSTPKG_CONFIG) libelf --cflags 2>/dev/null)
+ LIBELF_LIBS  := $(shell $(HOSTPKG_CONFIG) libelf --libs 2>/dev/null || echo -lelf)
+
+-HOSTCFLAGS += -g \
++HOSTCFLAGS_resolve_btfids += -g \
+           -I$(srctree)/tools/include \
+           -I$(srctree)/tools/include/uapi \
+           -I$(LIBBPF_INCLUDE) \
+@@ -76,7 +76,7 @@ HOSTCFLAGS += -g \
+
+ LIBS = $(LIBELF_LIBS) -lz
+
+-export srctree OUTPUT HOSTCFLAGS Q HOSTCC HOSTLD HOSTAR
++export srctree OUTPUT HOSTCFLAGS_resolve_btfids Q HOSTCC HOSTLD HOSTAR
+ include $(srctree)/tools/build/Makefile.include
+
+ $(BINARY_IN): fixdep FORCE prepare | $(OUTPUT)
diff --git a/sources b/sources
index 1f813c4c6..cedc1c5f8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.4-rc6-37-gb6dad5178cea.tar.xz) = cdda382e0b4013901fff28f13239d8eb8a3fa3f0f9027dd702b98d6452d303b2e9b5c9bc192ed9441ab12f09f64128933392b306fbc84b09a513eeaa7dbb2779
-SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 59cae60bc2e7666998438cfb4b49f7f48c49a354223fcb8d0ff26f1b1bcdd1da6d565e36eaad505f71673e3820f865cfb3c6bdbf41b8a60e64122fd08baa4420
-SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 810505a649769fe7c3321cce4e2c9d7d5a5a63646f269485eba6801a3b4fce7bfc492634856f271185f6707bbb4ee45eee0a280737887a9c59850c24d8ffc361
+SHA512 (linux-6.4-rc6-195-g40f71e7cd3c6.tar.xz) = b84ba8c4788c5cf9a974350994768c5320dad7258ea60c859255dca5b9842ccb8664b05ac9f3009566681d138b202a1c0ea11d40443639e022c6996785f82dbf
+SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = f76a7d2c7f7cb45f6790eca64c58ab15f75545105ec17202d1b7150f0460b6c25667342968f9a4cef806f1250c2334e4ea244cd00c897841792c0dbc7082cdaa
+SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 3114ed69d9e674d9c150abcd7356e0468b6615a98081344633e45a588dd4d1f951a7769962f1cc573e04f52a958df74bf2ddb5ca0c234c8d0b253f2ffeddac4d