diff --git a/patches.rpmify/Kconfig-make-CONFIG_CC_CAN_LINK-always-true.patch b/patches.rpmify/Kconfig-make-CONFIG_CC_CAN_LINK-always-true.patch
index 801027f..420354b 100644
--- a/patches.rpmify/Kconfig-make-CONFIG_CC_CAN_LINK-always-true.patch
+++ b/patches.rpmify/Kconfig-make-CONFIG_CC_CAN_LINK-always-true.patch
@@ -14,8 +14,8 @@ around this until we find a better solution.
 
 Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
 ---
- init/Kconfig | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
+ init/Kconfig | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 --- a/init/Kconfig
 +++ b/init/Kconfig
@@ -24,8 +24,8 @@ Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
  
  config CC_CAN_LINK
 -	bool
--	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m64-flag)) if 64BIT
--	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m32-flag))
+-	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m64-flag)) if 64BIT
+-	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m32-flag))
 +	def_bool y
  
  config CC_CAN_LINK_STATIC
diff --git a/patches.suse/Revert-fs-Do-not-check-if-there-is-a-fsnotify-watche.patch b/patches.suse/Revert-fs-Do-not-check-if-there-is-a-fsnotify-watche.patch
deleted file mode 100644
index e82c565..0000000
--- a/patches.suse/Revert-fs-Do-not-check-if-there-is-a-fsnotify-watche.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Mel Gorman <mgorman@techsingularity.net>
-Date: Mon, 29 Jun 2020 15:41:45 +0100
-Subject: Revert "fs: Do not check if there is a fsnotify watcher on pseudo inodes"
-Patch-mainline: v5.8-rc4
-Git-commit: b6509f6a8c4313c068c69785c001451415969e44
-References: http://lkml.kernel.org/r/7b4aa1e985007c6d582fffe5e8435f8153e28e0f.camel@redhat.com
-
-This reverts commit e9c15badbb7b ("fs: Do not check if there is a
-fsnotify watcher on pseudo inodes"). The commit intended to eliminate
-fsnotify-related overhead for pseudo inodes but it is broken in
-concept. inotify can receive events of pipe files under /proc/X/fd and
-chromium relies on close and open events for sandboxing. Maxim Levitsky
-reported the following
-
-  Chromium starts as a white rectangle, shows few white rectangles that
-  resemble its notifications and then crashes.
-
-  The stdout output from chromium:
-
-  [mlevitsk@starship ~]$chromium-freeworld
-  mesa: for the   --simplifycfg-sink-common option: may only occur zero or one times!
-  mesa: for the   --global-isel-abort option: may only occur zero or one times!
-  [3379:3379:0628/135151.440930:ERROR:browser_switcher_service.cc(238)] XXX Init()
-  ../../sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc:**CRASHING**:seccomp-bpf failure in syscall 0072
-  Received signal 11 SEGV_MAPERR 0000004a9048
-
-Crashes are not universal but even if chromium does not crash, it certainly
-does not work properly. While filtering just modify and access might be
-safe, the benefit is not worth the risk hence the revert.
-
-Reported-by: Maxim Levitsky <mlevitsk@redhat.com>
-Fixes: e9c15badbb7b ("fs: Do not check if there is a fsnotify watcher on pseudo inodes")
-Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Acked-by: Michal Kubecek <mkubecek@suse.cz>
-
----
- fs/file_table.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/file_table.c
-+++ b/fs/file_table.c
-@@ -230,7 +230,7 @@ struct file *alloc_file_pseudo(struct inode *inode, struct vfsmount *mnt,
- 		d_set_d_op(path.dentry, &anon_ops);
- 	path.mnt = mntget(mnt);
- 	d_instantiate(path.dentry, inode);
--	file = alloc_file(&path, flags | FMODE_NONOTIFY, fops);
-+	file = alloc_file(&path, flags, fops);
- 	if (IS_ERR(file)) {
- 		ihold(inode);
- 		path_put(&path);
diff --git a/rpm/config.sh b/rpm/config.sh
index 6d8bfdb..5a5aedd 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
 # The version of the main tarball to use
-SRCVERSION=5.8-rc3
+SRCVERSION=5.8-rc4
 # variant of the kernel-source package, either empty or "-rt"
 VARIANT=
 # enable kernel module compression
diff --git a/series.conf b/series.conf
index ecee30c..ef967aa 100644
--- a/series.conf
+++ b/series.conf
@@ -52,7 +52,6 @@
 	# to area specific sections below.
 	########################################################
 	patches.suse/iwl-fix-crash-in-iwl_dbg_tlv_alloc_trigger.patch
-	patches.suse/Revert-fs-Do-not-check-if-there-is-a-fsnotify-watche.patch
 
 	########################################################
 	# kbuild/module infrastructure fixes