diff --git a/test/integration/rhel-8.6/bug-table-section.patch b/test/integration/rhel-8.6/bug-table-section.patch
new file mode 100644
index 0000000..7d05c04
--- /dev/null
+++ b/test/integration/rhel-8.6/bug-table-section.patch
@@ -0,0 +1,12 @@
+diff -Nupr src.orig/fs/proc/proc_sysctl.c src/fs/proc/proc_sysctl.c
+--- src.orig/fs/proc/proc_sysctl.c	2022-04-29 16:08:21.409780550 -0400
++++ src/fs/proc/proc_sysctl.c	2022-04-29 16:08:21.908782326 -0400
+@@ -338,6 +338,8 @@ static void start_unregistering(struct c
+ 
+ static struct ctl_table_header *sysctl_head_grab(struct ctl_table_header *head)
+ {
++	if (jiffies == 0)
++		printk("kpatch-test: testing __bug_table section changes\n");
+ 	BUG_ON(!head);
+ 	spin_lock(&sysctl_lock);
+ 	if (!use_table(head))
diff --git a/test/integration/rhel-8.6/cmdline-string-LOADED.test b/test/integration/rhel-8.6/cmdline-string-LOADED.test
new file mode 100755
index 0000000..a8e0a08
--- /dev/null
+++ b/test/integration/rhel-8.6/cmdline-string-LOADED.test
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grep kpatch=1 /proc/cmdline
diff --git a/test/integration/rhel-8.6/cmdline-string.patch b/test/integration/rhel-8.6/cmdline-string.patch
new file mode 100644
index 0000000..f547c87
--- /dev/null
+++ b/test/integration/rhel-8.6/cmdline-string.patch
@@ -0,0 +1,13 @@
+diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c
+--- src.orig/fs/proc/cmdline.c	2022-04-29 16:08:21.408780547 -0400
++++ src/fs/proc/cmdline.c	2022-04-29 16:08:24.434791315 -0400
+@@ -6,8 +6,7 @@
+ 
+ static int cmdline_proc_show(struct seq_file *m, void *v)
+ {
+-	seq_puts(m, saved_command_line);
+-	seq_putc(m, '\n');
++	seq_printf(m, "%s kpatch=1\n", saved_command_line);
+ 	return 0;
+ }
+ 
diff --git a/test/integration/rhel-8.6/data-new-LOADED.test b/test/integration/rhel-8.6/data-new-LOADED.test
new file mode 100755
index 0000000..9f25744
--- /dev/null
+++ b/test/integration/rhel-8.6/data-new-LOADED.test
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grep "kpatch:         5" /proc/meminfo
diff --git a/test/integration/rhel-8.6/data-new.patch b/test/integration/rhel-8.6/data-new.patch
new file mode 100644
index 0000000..2fd4b91
--- /dev/null
+++ b/test/integration/rhel-8.6/data-new.patch
@@ -0,0 +1,20 @@
+diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
+--- src.orig/fs/proc/meminfo.c	2022-04-29 16:08:21.409780550 -0400
++++ src/fs/proc/meminfo.c	2022-04-29 16:08:26.826799828 -0400
+@@ -31,6 +31,8 @@ static void show_val_kb(struct seq_file
+ 	seq_write(m, " kB\n", 4);
+ }
+ 
++static int foo = 5;
++
+ static int meminfo_proc_show(struct seq_file *m, void *v)
+ {
+ 	struct sysinfo i;
+@@ -150,6 +152,7 @@ static int meminfo_proc_show(struct seq_
+ 	show_val_kb(m, "CmaFree:        ",
+ 		    global_zone_page_state(NR_FREE_CMA_PAGES));
+ #endif
++	seq_printf(m, "kpatch:         %d\n", foo);
+ 
+ 	hugetlb_report_meminfo(m);
+ 
diff --git a/test/integration/rhel-8.6/data-read-mostly.patch b/test/integration/rhel-8.6/data-read-mostly.patch
new file mode 100644
index 0000000..6f9e324
--- /dev/null
+++ b/test/integration/rhel-8.6/data-read-mostly.patch
@@ -0,0 +1,11 @@
+diff -Nupr src.orig/net/core/dev.c src/net/core/dev.c
+--- src.orig/net/core/dev.c	2022-04-29 16:08:21.614781280 -0400
++++ src/net/core/dev.c	2022-04-29 16:08:29.184808219 -0400
+@@ -5278,6 +5278,7 @@ skip_classify:
+ 		case RX_HANDLER_PASS:
+ 			break;
+ 		default:
++			printk("BUG!\n");
+ 			BUG();
+ 		}
+ 	}
diff --git a/test/integration/rhel-8.6/fixup-section.patch b/test/integration/rhel-8.6/fixup-section.patch
new file mode 100644
index 0000000..efcbfc2
--- /dev/null
+++ b/test/integration/rhel-8.6/fixup-section.patch
@@ -0,0 +1,11 @@
+diff -Nupr src.orig/fs/readdir.c src/fs/readdir.c
+--- src.orig/fs/readdir.c	2022-04-29 16:08:21.360780376 -0400
++++ src/fs/readdir.c	2022-04-29 16:08:31.537816593 -0400
+@@ -189,6 +189,7 @@ static int filldir(struct dir_context *c
+ 			goto efault;
+ 	}
+ 	dirent = buf->current_dir;
++	asm("nop");
+ 	if (__put_user(d_ino, &dirent->d_ino))
+ 		goto efault;
+ 	if (__put_user(reclen, &dirent->d_reclen))
diff --git a/test/integration/rhel-8.6/gcc-constprop.patch b/test/integration/rhel-8.6/gcc-constprop.patch
new file mode 100644
index 0000000..d923fbb
--- /dev/null
+++ b/test/integration/rhel-8.6/gcc-constprop.patch
@@ -0,0 +1,13 @@
+diff -Nupr src.orig/kernel/time/timekeeping.c src/kernel/time/timekeeping.c
+--- src.orig/kernel/time/timekeeping.c	2022-04-29 16:08:21.581781162 -0400
++++ src/kernel/time/timekeeping.c	2022-04-29 16:08:33.934825123 -0400
+@@ -1231,6 +1231,9 @@ void do_gettimeofday(struct timeval *tv)
+ {
+ 	struct timespec64 now;
+ 
++	if (!tv)
++		return;
++
+ 	getnstimeofday64(&now);
+ 	tv->tv_sec = now.tv_sec;
+ 	tv->tv_usec = now.tv_nsec/1000;
diff --git a/test/integration/rhel-8.6/gcc-isra.patch b/test/integration/rhel-8.6/gcc-isra.patch
new file mode 100644
index 0000000..c873c3b
--- /dev/null
+++ b/test/integration/rhel-8.6/gcc-isra.patch
@@ -0,0 +1,11 @@
+diff -Nupr src.orig/fs/proc/proc_sysctl.c src/fs/proc/proc_sysctl.c
+--- src.orig/fs/proc/proc_sysctl.c	2022-04-29 16:08:21.409780550 -0400
++++ src/fs/proc/proc_sysctl.c	2022-04-29 16:08:36.314833593 -0400
+@@ -53,6 +53,7 @@ void proc_sys_poll_notify(struct ctl_tab
+ 	if (!poll)
+ 		return;
+ 
++	printk("kpatch-test: testing gcc .isra function name mangling\n");
+ 	atomic_inc(&poll->event);
+ 	wake_up_interruptible(&poll->wait);
+ }
diff --git a/test/integration/rhel-8.6/gcc-mangled-3.patch b/test/integration/rhel-8.6/gcc-mangled-3.patch
new file mode 100644
index 0000000..19d54e1
--- /dev/null
+++ b/test/integration/rhel-8.6/gcc-mangled-3.patch
@@ -0,0 +1,13 @@
+diff -Nupr src.orig/mm/slub.c src/mm/slub.c
+--- src.orig/mm/slub.c	2022-04-29 16:08:21.601781233 -0400
++++ src/mm/slub.c	2022-04-29 16:08:38.713842130 -0400
+@@ -6107,6 +6107,9 @@ void get_slabinfo(struct kmem_cache *s,
+ 	int node;
+ 	struct kmem_cache_node *n;
+ 
++	if (!jiffies)
++		printk("slabinfo\n");
++
+ 	for_each_kmem_cache_node(s, node, n) {
+ 		nr_slabs += node_nr_slabs(n);
+ 		nr_objs += node_nr_objs(n);
diff --git a/test/integration/rhel-8.6/gcc-static-local-var-2.patch b/test/integration/rhel-8.6/gcc-static-local-var-2.patch
new file mode 100644
index 0000000..a796431
--- /dev/null
+++ b/test/integration/rhel-8.6/gcc-static-local-var-2.patch
@@ -0,0 +1,13 @@
+diff -Nupr src.orig/mm/mmap.c src/mm/mmap.c
+--- src.orig/mm/mmap.c	2022-04-29 16:08:21.599781226 -0400
++++ src/mm/mmap.c	2022-04-29 16:08:41.140850766 -0400
+@@ -1714,6 +1714,9 @@ unsigned long mmap_region(struct file *f
+ 	struct rb_node **rb_link, *rb_parent;
+ 	unsigned long charged = 0;
+ 
++	if (!jiffies)
++		printk("kpatch mmap foo\n");
++
+ 	/* Check against address space limit. */
+ 	if (!may_expand_vm(mm, vm_flags, len >> PAGE_SHIFT)) {
+ 		unsigned long nr_pages;
diff --git a/test/integration/rhel-8.6/gcc-static-local-var-3.patch b/test/integration/rhel-8.6/gcc-static-local-var-3.patch
new file mode 100644
index 0000000..286975e
--- /dev/null
+++ b/test/integration/rhel-8.6/gcc-static-local-var-3.patch
@@ -0,0 +1,19 @@
+diff -Nupr src.orig/kernel/reboot.c src/kernel/reboot.c
+--- src.orig/kernel/reboot.c	2022-04-29 16:08:21.578781152 -0400
++++ src/kernel/reboot.c	2022-04-29 16:08:43.524859249 -0400
+@@ -393,8 +393,15 @@ SYSCALL_DEFINE4(reboot, int, magic1, int
+ 	return ret;
+ }
+ 
++void kpatch_bar(void)
++{
++	if (!jiffies)
++		printk("kpatch_foo\n");
++}
++
+ static void deferred_cad(struct work_struct *dummy)
+ {
++	kpatch_bar();
+ 	kernel_restart(NULL);
+ }
+ 
diff --git a/test/integration/rhel-8.6/gcc-static-local-var-4.patch b/test/integration/rhel-8.6/gcc-static-local-var-4.patch
new file mode 100644
index 0000000..ad95d02
--- /dev/null
+++ b/test/integration/rhel-8.6/gcc-static-local-var-4.patch
@@ -0,0 +1,23 @@
+diff -Nupr src.orig/fs/aio.c src/fs/aio.c
+--- src.orig/fs/aio.c	2022-04-29 16:08:21.357780365 -0400
++++ src/fs/aio.c	2022-04-29 16:08:45.936867833 -0400
+@@ -247,11 +247,18 @@ static int __init aio_setup(void)
+ }
+ __initcall(aio_setup);
+ 
+-static void put_aio_ring_file(struct kioctx *ctx)
++void kpatch_aio_foo(void)
++{
++	if (!jiffies)
++		printk("kpatch aio foo\n");
++}
++
++__always_inline static void put_aio_ring_file(struct kioctx *ctx)
+ {
+ 	struct file *aio_ring_file = ctx->aio_ring_file;
+ 	struct address_space *i_mapping;
+ 
++	kpatch_aio_foo();
+ 	if (aio_ring_file) {
+ 		truncate_setsize(file_inode(aio_ring_file), 0);
+ 
diff --git a/test/integration/rhel-8.6/gcc-static-local-var-4.test b/test/integration/rhel-8.6/gcc-static-local-var-4.test
new file mode 100755
index 0000000..e085f93
--- /dev/null
+++ b/test/integration/rhel-8.6/gcc-static-local-var-4.test
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -o pipefail
+if ! $(eu-readelf --wide --symbols test-gcc-static-local-var-4.ko | awk '$NF == "free_ioctx" { exit 1 }'); then
+	exit 1
+else
+	exit 0
+fi
diff --git a/test/integration/rhel-8.6/gcc-static-local-var-5.patch b/test/integration/rhel-8.6/gcc-static-local-var-5.patch
new file mode 100644
index 0000000..44ee755
--- /dev/null
+++ b/test/integration/rhel-8.6/gcc-static-local-var-5.patch
@@ -0,0 +1,45 @@
+diff -Nupr src.orig/kernel/audit.c src/kernel/audit.c
+--- src.orig/kernel/audit.c	2022-04-29 16:08:21.568781116 -0400
++++ src/kernel/audit.c	2022-04-29 16:08:48.347876413 -0400
+@@ -327,6 +327,12 @@ void audit_panic(const char *message)
+ 	}
+ }
+ 
++void kpatch_audit_foo(void)
++{
++	if (!jiffies)
++		printk("kpatch audit foo\n");
++}
++
+ static inline int audit_rate_check(void)
+ {
+ 	static unsigned long	last_check = 0;
+@@ -337,6 +343,7 @@ static inline int audit_rate_check(void)
+ 	unsigned long		elapsed;
+ 	int			retval	   = 0;
+ 
++	kpatch_audit_foo();
+ 	if (!audit_rate_limit) return 1;
+ 
+ 	spin_lock_irqsave(&lock, flags);
+@@ -356,6 +363,11 @@ static inline int audit_rate_check(void)
+ 	return retval;
+ }
+ 
++noinline void kpatch_audit_check(void)
++{
++	audit_rate_check();
++}
++
+ /**
+  * audit_log_lost - conditionally log lost audit message event
+  * @message: the message stating reason for lost audit message
+@@ -402,6 +414,8 @@ static int audit_log_config_change(char
+ 	struct audit_buffer *ab;
+ 	int rc = 0;
+ 
++	kpatch_audit_check();
++
+ 	ab = audit_log_start(audit_context(), GFP_KERNEL, AUDIT_CONFIG_CHANGE);
+ 	if (unlikely(!ab))
+ 		return rc;
diff --git a/test/integration/rhel-8.6/gcc-static-local-var-6.patch b/test/integration/rhel-8.6/gcc-static-local-var-6.patch
new file mode 100644
index 0000000..14c79a5
--- /dev/null
+++ b/test/integration/rhel-8.6/gcc-static-local-var-6.patch
@@ -0,0 +1,22 @@
+diff -Nupr src.orig/net/ipv6/netfilter.c src/net/ipv6/netfilter.c
+--- src.orig/net/ipv6/netfilter.c	2022-04-29 16:08:21.627781326 -0400
++++ src/net/ipv6/netfilter.c	2022-04-29 16:08:50.811885181 -0400
+@@ -86,6 +86,8 @@ static int nf_ip6_reroute(struct sk_buff
+ 	return 0;
+ }
+ 
++#include "kpatch-macros.h"
++
+ int __nf_ip6_route(struct net *net, struct dst_entry **dst,
+ 		   struct flowi *fl, bool strict)
+ {
+@@ -99,6 +101,9 @@ int __nf_ip6_route(struct net *net, stru
+ 	struct dst_entry *result;
+ 	int err;
+ 
++	if (!jiffies)
++		printk("kpatch nf_ip6_route foo\n");
++
+ 	result = ip6_route_output(net, sk, &fl->u.ip6);
+ 	err = result->error;
+ 	if (err)
diff --git a/test/integration/rhel-8.6/macro-callbacks.patch b/test/integration/rhel-8.6/macro-callbacks.patch
new file mode 100644
index 0000000..24a2579
--- /dev/null
+++ b/test/integration/rhel-8.6/macro-callbacks.patch
@@ -0,0 +1,155 @@
+diff -Nupr src.orig/drivers/input/joydev.c src/drivers/input/joydev.c
+--- src.orig/drivers/input/joydev.c	2022-04-29 16:08:20.747778194 -0400
++++ src/drivers/input/joydev.c	2022-04-29 16:08:53.228893783 -0400
+@@ -1087,3 +1087,47 @@ static void __exit joydev_exit(void)
+ 
+ module_init(joydev_init);
+ module_exit(joydev_exit);
++
++#include <linux/module.h>
++#include "kpatch-macros.h"
++
++static const char *const module_state[] = {
++	[MODULE_STATE_LIVE]	= "[MODULE_STATE_LIVE] Normal state",
++	[MODULE_STATE_COMING]	= "[MODULE_STATE_COMING] Full formed, running module_init",
++	[MODULE_STATE_GOING]	= "[MODULE_STATE_GOING] Going away",
++	[MODULE_STATE_UNFORMED]	= "[MODULE_STATE_UNFORMED] Still setting it up",
++};
++
++static void callback_info(const char *callback, patch_object *obj)
++{
++	if (obj->mod)
++		pr_info("%s: %s -> %s\n", callback, obj->mod->name,
++			module_state[obj->mod->state]);
++	else
++		pr_info("%s: vmlinux\n", callback);
++}
++
++static int pre_patch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++	return 0; /* return -ENODEV; */
++}
++KPATCH_PRE_PATCH_CALLBACK(pre_patch_callback);
++
++static void post_patch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++}
++KPATCH_POST_PATCH_CALLBACK(post_patch_callback);
++
++static void pre_unpatch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++}
++KPATCH_PRE_UNPATCH_CALLBACK(pre_unpatch_callback);
++
++static void post_unpatch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++}
++KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
+diff -Nupr src.orig/drivers/input/misc/pcspkr.c src/drivers/input/misc/pcspkr.c
+--- src.orig/drivers/input/misc/pcspkr.c	2022-04-29 16:08:20.752778212 -0400
++++ src/drivers/input/misc/pcspkr.c	2022-04-29 16:08:53.229893786 -0400
+@@ -133,3 +133,46 @@ static struct platform_driver pcspkr_pla
+ };
+ module_platform_driver(pcspkr_platform_driver);
+ 
++#include <linux/module.h>
++#include "kpatch-macros.h"
++
++static const char *const module_state[] = {
++	[MODULE_STATE_LIVE]	= "[MODULE_STATE_LIVE] Normal state",
++	[MODULE_STATE_COMING]	= "[MODULE_STATE_COMING] Full formed, running module_init",
++	[MODULE_STATE_GOING]	= "[MODULE_STATE_GOING] Going away",
++	[MODULE_STATE_UNFORMED]	= "[MODULE_STATE_UNFORMED] Still setting it up",
++};
++
++static void callback_info(const char *callback, patch_object *obj)
++{
++	if (obj->mod)
++		pr_info("%s: %s -> %s\n", callback, obj->mod->name,
++			module_state[obj->mod->state]);
++	else
++		pr_info("%s: vmlinux\n", callback);
++}
++
++static int pre_patch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++	return 0;
++}
++KPATCH_PRE_PATCH_CALLBACK(pre_patch_callback);
++
++static void post_patch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++}
++KPATCH_POST_PATCH_CALLBACK(post_patch_callback);
++
++static void pre_unpatch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++}
++KPATCH_PRE_UNPATCH_CALLBACK(pre_unpatch_callback);
++
++static void post_unpatch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++}
++KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
+diff -Nupr src.orig/fs/aio.c src/fs/aio.c
+--- src.orig/fs/aio.c	2022-04-29 16:08:21.357780365 -0400
++++ src/fs/aio.c	2022-04-29 16:08:53.229893786 -0400
+@@ -48,6 +48,50 @@
+ 
+ #define KIOCB_KEY		0
+ 
++#include <linux/module.h>
++#include "kpatch-macros.h"
++
++static const char *const module_state[] = {
++	[MODULE_STATE_LIVE]	= "[MODULE_STATE_LIVE] Normal state",
++	[MODULE_STATE_COMING]	= "[MODULE_STATE_COMING] Full formed, running module_init",
++	[MODULE_STATE_GOING]	= "[MODULE_STATE_GOING] Going away",
++	[MODULE_STATE_UNFORMED]	= "[MODULE_STATE_UNFORMED] Still setting it up",
++};
++
++static void callback_info(const char *callback, patch_object *obj)
++{
++	if (obj->mod)
++		pr_info("%s: %s -> %s\n", callback, obj->mod->name,
++			module_state[obj->mod->state]);
++	else
++		pr_info("%s: vmlinux\n", callback);
++}
++
++static int pre_patch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++	return 0;
++}
++KPATCH_PRE_PATCH_CALLBACK(pre_patch_callback);
++
++static void post_patch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++}
++KPATCH_POST_PATCH_CALLBACK(post_patch_callback);
++
++static void pre_unpatch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++}
++KPATCH_PRE_UNPATCH_CALLBACK(pre_unpatch_callback);
++
++static void post_unpatch_callback(patch_object *obj)
++{
++	callback_info(__func__, obj);
++}
++KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
++
+ #define AIO_RING_MAGIC			0xa10a10a1
+ #define AIO_RING_COMPAT_FEATURES	1
+ #define AIO_RING_INCOMPAT_FEATURES	0
diff --git a/test/integration/rhel-8.6/macro-printk.patch b/test/integration/rhel-8.6/macro-printk.patch
new file mode 100644
index 0000000..74bd4a9
--- /dev/null
+++ b/test/integration/rhel-8.6/macro-printk.patch
@@ -0,0 +1,149 @@
+diff -Nupr src.orig/net/ipv4/fib_frontend.c src/net/ipv4/fib_frontend.c
+--- src.orig/net/ipv4/fib_frontend.c	2022-04-29 16:08:21.621781305 -0400
++++ src/net/ipv4/fib_frontend.c	2022-04-29 16:08:55.676902494 -0400
+@@ -792,6 +792,7 @@ errout:
+ 	return err;
+ }
+ 
++#include "kpatch-macros.h"
+ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh,
+ 			     struct netlink_ext_ack *extack)
+ {
+@@ -813,6 +814,7 @@ static int inet_rtm_newroute(struct sk_b
+ 	err = fib_table_insert(net, tb, &cfg, extack);
+ 	if (!err && cfg.fc_type == RTN_LOCAL)
+ 		net->ipv4.fib_has_custom_local_routes = true;
++	KPATCH_PRINTK("[inet_rtm_newroute]: err is %d\n", err);
+ errout:
+ 	return err;
+ }
+diff -Nupr src.orig/net/ipv4/fib_semantics.c src/net/ipv4/fib_semantics.c
+--- src.orig/net/ipv4/fib_semantics.c	2022-04-29 16:08:21.621781305 -0400
++++ src/net/ipv4/fib_semantics.c	2022-04-29 16:08:55.677902498 -0400
+@@ -1022,6 +1022,7 @@ static bool fib_valid_prefsrc(struct fib
+ 	return true;
+ }
+ 
++#include "kpatch-macros.h"
+ struct fib_info *fib_create_info(struct fib_config *cfg,
+ 				 struct netlink_ext_ack *extack)
+ {
+@@ -1055,6 +1056,7 @@ struct fib_info *fib_create_info(struct
+ #endif
+ 
+ 	err = -ENOBUFS;
++	KPATCH_PRINTK("[fib_create_info]: create error err is %d\n",err);
+ 	if (fib_info_cnt >= fib_info_hash_size) {
+ 		unsigned int new_size = fib_info_hash_size << 1;
+ 		struct hlist_head *new_info_hash;
+@@ -1075,6 +1077,7 @@ struct fib_info *fib_create_info(struct
+ 		if (!fib_info_hash_size)
+ 			goto failure;
+ 	}
++	KPATCH_PRINTK("[fib_create_info]: 2 create error err is %d\n",err);
+ 
+ 	fi = kzalloc(sizeof(*fi)+nhs*sizeof(struct fib_nh), GFP_KERNEL);
+ 	if (!fi)
+@@ -1088,6 +1091,8 @@ struct fib_info *fib_create_info(struct
+ 	}
+ 
+ 	fib_info_cnt++;
++	KPATCH_PRINTK("[fib_create_info]: 3 create error err is %d\n",err);
++
+ 	fi->fib_net = net;
+ 	fi->fib_protocol = cfg->fc_protocol;
+ 	fi->fib_scope = cfg->fc_scope;
+@@ -1143,9 +1148,11 @@ struct fib_info *fib_create_info(struct
+ 					       "LWT encap type not specified");
+ 				goto err_inval;
+ 			}
++			KPATCH_PRINTK("[fib_create_info]: 4 create error err is %d\n",err);
+ 			err = lwtunnel_build_state(cfg->fc_encap_type,
+ 						   cfg->fc_encap, AF_INET, cfg,
+ 						   &lwtstate, extack);
++			KPATCH_PRINTK("[fib_create_info]: 5 create error err is %d\n",err);
+ 			if (err)
+ 				goto failure;
+ 
+@@ -1163,6 +1170,7 @@ struct fib_info *fib_create_info(struct
+ 		nh->nh_weight = 1;
+ #endif
+ 	}
++	KPATCH_PRINTK("[fib_create_info]: 6 create error err is %d\n",err);
+ 
+ 	if (fib_props[cfg->fc_type].error) {
+ 		if (cfg->fc_gw || cfg->fc_oif || cfg->fc_mp) {
+@@ -1184,6 +1192,7 @@ struct fib_info *fib_create_info(struct
+ 			goto err_inval;
+ 		}
+ 	}
++	KPATCH_PRINTK("[fib_create_info]: 7 create error err is %d\n",err);
+ 
+ 	if (cfg->fc_scope > RT_SCOPE_HOST) {
+ 		NL_SET_ERR_MSG(extack, "Invalid scope");
+@@ -1222,6 +1231,7 @@ struct fib_info *fib_create_info(struct
+ 		if (linkdown == fi->fib_nhs)
+ 			fi->fib_flags |= RTNH_F_LINKDOWN;
+ 	}
++	KPATCH_PRINTK("[fib_create_info]: 8 create error err is %d\n",err);
+ 
+ 	if (fi->fib_prefsrc && !fib_valid_prefsrc(cfg, fi->fib_prefsrc)) {
+ 		NL_SET_ERR_MSG(extack, "Invalid prefsrc address");
+@@ -1231,6 +1241,7 @@ struct fib_info *fib_create_info(struct
+ 	change_nexthops(fi) {
+ 		fib_info_update_nh_saddr(net, nexthop_nh);
+ 	} endfor_nexthops(fi)
++	KPATCH_PRINTK("[fib_create_info]: 9 create error err is %d\n",err);
+ 
+ 	fib_rebalance(fi);
+ 
+@@ -1242,6 +1253,7 @@ link_it:
+ 		ofi->fib_treeref++;
+ 		return ofi;
+ 	}
++	KPATCH_PRINTK("[fib_create_info]: 10 create error err is %d\n",err);
+ 
+ 	fi->fib_treeref++;
+ 	refcount_set(&fi->fib_clntref, 1);
+@@ -1265,6 +1277,7 @@ link_it:
+ 		hlist_add_head(&nexthop_nh->nh_hash, head);
+ 	} endfor_nexthops(fi)
+ 	spin_unlock_bh(&fib_info_lock);
++	KPATCH_PRINTK("[fib_create_info]: 11 create error err is %d\n",err);
+ 	return fi;
+ 
+ err_inval:
+@@ -1275,6 +1288,7 @@ failure:
+ 		fi->fib_dead = 1;
+ 		free_fib_info(fi);
+ 	}
++	KPATCH_PRINTK("[fib_create_info]: 12 create error err is %d\n",err);
+ 
+ 	return ERR_PTR(err);
+ }
+diff -Nupr src.orig/net/ipv4/fib_trie.c src/net/ipv4/fib_trie.c
+--- src.orig/net/ipv4/fib_trie.c	2022-04-29 16:08:21.621781305 -0400
++++ src/net/ipv4/fib_trie.c	2022-04-29 16:08:55.677902498 -0400
+@@ -1174,6 +1174,7 @@ static void fib_remove_alias(struct trie
+ 			     struct key_vector *l, struct fib_alias *old);
+ 
+ /* Caller must hold RTNL. */
++#include "kpatch-macros.h"
+ int fib_table_insert(struct net *net, struct fib_table *tb,
+ 		     struct fib_config *cfg, struct netlink_ext_ack *extack)
+ {
+@@ -1195,11 +1196,14 @@ int fib_table_insert(struct net *net, st
+ 
+ 	pr_debug("Insert table=%u %08x/%d\n", tb->tb_id, key, plen);
+ 
++	KPATCH_PRINTK("[fib_table_insert]: start\n");
+ 	fi = fib_create_info(cfg, extack);
+ 	if (IS_ERR(fi)) {
+ 		err = PTR_ERR(fi);
++		KPATCH_PRINTK("[fib_table_insert]: create error err is %d\n",err);
+ 		goto err;
+ 	}
++	KPATCH_PRINTK("[fib_table_insert]: cross\n");
+ 
+ 	l = fib_find_node(t, &tp, key);
+ 	fa = l ? fib_find_alias(&l->leaf, slen, tos, fi->fib_priority,
diff --git a/test/integration/rhel-8.6/meminfo-init-FAIL.patch b/test/integration/rhel-8.6/meminfo-init-FAIL.patch
new file mode 100644
index 0000000..5105bed
--- /dev/null
+++ b/test/integration/rhel-8.6/meminfo-init-FAIL.patch
@@ -0,0 +1,11 @@
+diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
+--- src.orig/fs/proc/meminfo.c	2022-04-29 16:08:21.409780550 -0400
++++ src/fs/proc/meminfo.c	2022-04-29 16:09:00.653920206 -0400
+@@ -160,6 +160,7 @@ static int meminfo_proc_show(struct seq_
+ 
+ static int __init proc_meminfo_init(void)
+ {
++	printk("a\n");
+ 	proc_create_single("meminfo", 0, NULL, meminfo_proc_show);
+ 	return 0;
+ }
diff --git a/test/integration/rhel-8.6/meminfo-init2-FAIL.patch b/test/integration/rhel-8.6/meminfo-init2-FAIL.patch
new file mode 100644
index 0000000..913d67a
--- /dev/null
+++ b/test/integration/rhel-8.6/meminfo-init2-FAIL.patch
@@ -0,0 +1,19 @@
+diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
+--- src.orig/fs/proc/meminfo.c	2022-04-29 16:08:21.409780550 -0400
++++ src/fs/proc/meminfo.c	2022-04-29 16:08:58.219911544 -0400
+@@ -41,6 +41,7 @@ static int meminfo_proc_show(struct seq_
+ 	unsigned long sreclaimable, sunreclaim;
+ 	int lru;
+ 
++	printk("a\n");
+ 	si_meminfo(&i);
+ 	si_swapinfo(&i);
+ 	committed = percpu_counter_read_positive(&vm_committed_as);
+@@ -160,6 +161,7 @@ static int meminfo_proc_show(struct seq_
+ 
+ static int __init proc_meminfo_init(void)
+ {
++	printk("a\n");
+ 	proc_create_single("meminfo", 0, NULL, meminfo_proc_show);
+ 	return 0;
+ }
diff --git a/test/integration/rhel-8.6/meminfo-string-LOADED.test b/test/integration/rhel-8.6/meminfo-string-LOADED.test
new file mode 100755
index 0000000..10dc20b
--- /dev/null
+++ b/test/integration/rhel-8.6/meminfo-string-LOADED.test
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grep VMALLOCCHUNK /proc/meminfo
diff --git a/test/integration/rhel-8.6/meminfo-string.patch b/test/integration/rhel-8.6/meminfo-string.patch
new file mode 100644
index 0000000..6992c27
--- /dev/null
+++ b/test/integration/rhel-8.6/meminfo-string.patch
@@ -0,0 +1,12 @@
+diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
+--- src.orig/fs/proc/meminfo.c	2022-04-29 16:08:21.409780550 -0400
++++ src/fs/proc/meminfo.c	2022-04-29 16:09:03.079928840 -0400
+@@ -124,7 +124,7 @@ static int meminfo_proc_show(struct seq_
+ 	seq_printf(m, "VmallocTotal:   %8lu kB\n",
+ 		   (unsigned long)VMALLOC_TOTAL >> 10);
+ 	show_val_kb(m, "VmallocUsed:    ", 0ul);
+-	show_val_kb(m, "VmallocChunk:   ", 0ul);
++	show_val_kb(m, "VMALLOCCHUNK:   ", 0ul);
+ 	show_val_kb(m, "Percpu:         ", pcpu_nr_pages());
+ 
+ #ifdef CONFIG_MEMORY_FAILURE
diff --git a/test/integration/rhel-8.6/module-LOADED.test b/test/integration/rhel-8.6/module-LOADED.test
new file mode 100755
index 0000000..72bb852
--- /dev/null
+++ b/test/integration/rhel-8.6/module-LOADED.test
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -o errexit
+
+sudo modprobe nfsd
+sleep 5
+grep -q kpatch /proc/fs/nfs/exports
+
+# TODO: This will trigger a printk on newer kernels which have the .klp.arch
+# removal.  Don't actually do the grep until running on a newer kernel.
+echo "file fs/nfsd/export.c +p" > /sys/kernel/debug/dynamic_debug/control
+cat /proc/fs/nfs/exports > /dev/null
+# dmesg | grep -q "kpatch: pr_debug"
diff --git a/test/integration/rhel-8.6/module.patch b/test/integration/rhel-8.6/module.patch
new file mode 100644
index 0000000..4818ee0
--- /dev/null
+++ b/test/integration/rhel-8.6/module.patch
@@ -0,0 +1,85 @@
+From 08078d00ab1749a6f84148a00d8d26572af4ec97 Mon Sep 17 00:00:00 2001
+Message-Id: <08078d00ab1749a6f84148a00d8d26572af4ec97.1586900628.git.jpoimboe@redhat.com>
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+Date: Tue, 14 Apr 2020 15:17:51 -0500
+Subject: [PATCH] kpatch module integration test
+
+This tests several things related to the patching of modules:
+
+- 'kpatch_string' tests the referencing of a symbol which is outside the
+  .o, but inside the patch module.
+
+- alternatives patching (.altinstructions)
+
+- paravirt patching (.parainstructions)
+
+- jump labels (5.8+ kernels only) -- including dynamic printk
+
+Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
+---
+ fs/nfsd/export.c         | 30 ++++++++++++++++++++++++++++++
+ net/netlink/af_netlink.c |  5 +++++
+ 2 files changed, 35 insertions(+)
+
+diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c
+--- src.orig/fs/nfsd/export.c	2022-04-29 16:08:21.394780497 -0400
++++ src/fs/nfsd/export.c	2022-04-29 16:09:05.551937637 -0400
+@@ -1228,15 +1228,45 @@ static void exp_flags(struct seq_file *m
+ 	}
+ }
+ 
++#include <linux/version.h>
++extern char *kpatch_string(void);
++
+ static int e_show(struct seq_file *m, void *p)
+ {
+ 	struct cache_head *cp = p;
+ 	struct svc_export *exp = container_of(cp, struct svc_export, h);
+ 	struct cache_detail *cd = m->private;
++#ifdef CONFIG_X86_64
++	unsigned long long sched_clock;
++
++	alternative("ud2", "call yield", X86_FEATURE_ALWAYS);
++	alternative("call yield", "ud2", X86_FEATURE_IA64);
++
++	sched_clock = paravirt_sched_clock();
++	if (!jiffies)
++		printk("kpatch: sched_clock: %llu\n", sched_clock);
++#endif
++
++	pr_debug("kpatch: pr_debug() test\n");
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++{
++	static DEFINE_STATIC_KEY_TRUE(kpatch_key);
++
++	if (static_branch_unlikely(&mcsafe_key))
++		printk("kpatch: mcsafe_key\n");
++
++	BUG_ON(!static_branch_likely(&kpatch_key));
++	static_branch_disable(&kpatch_key);
++	BUG_ON(static_branch_likely(&kpatch_key));
++	static_branch_enable(&kpatch_key);
++}
++#endif
+ 
+ 	if (p == SEQ_START_TOKEN) {
+ 		seq_puts(m, "# Version 1.1\n");
+ 		seq_puts(m, "# Path Client(Flags) # IPs\n");
++		seq_puts(m, kpatch_string());
+ 		return 0;
+ 	}
+ 
+diff -Nupr src.orig/net/netlink/af_netlink.c src/net/netlink/af_netlink.c
+--- src.orig/net/netlink/af_netlink.c	2022-04-29 16:08:21.644781386 -0400
++++ src/net/netlink/af_netlink.c	2022-04-29 16:09:05.551937637 -0400
+@@ -2887,4 +2887,9 @@ panic:
+ 	panic("netlink_init: Cannot allocate nl_table\n");
+ }
+ 
++char *kpatch_string(void)
++{
++	return "# kpatch\n";
++}
++
+ core_initcall(netlink_proto_init);
diff --git a/test/integration/rhel-8.6/multiple.test b/test/integration/rhel-8.6/multiple.test
new file mode 100755
index 0000000..7e4b352
--- /dev/null
+++ b/test/integration/rhel-8.6/multiple.test
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+SCRIPTDIR="$(readlink -f $(dirname $(type -p $0)))"
+
+declare -a blacklist=(meminfo-string-LOADED.test)
+
+source ${SCRIPTDIR}/../common/multiple.template
diff --git a/test/integration/rhel-8.6/new-function.patch b/test/integration/rhel-8.6/new-function.patch
new file mode 100644
index 0000000..146ca31
--- /dev/null
+++ b/test/integration/rhel-8.6/new-function.patch
@@ -0,0 +1,25 @@
+diff -Nupr src.orig/drivers/tty/n_tty.c src/drivers/tty/n_tty.c
+--- src.orig/drivers/tty/n_tty.c	2022-04-29 16:08:21.286780112 -0400
++++ src/drivers/tty/n_tty.c	2022-04-29 16:09:07.953946185 -0400
+@@ -2298,7 +2298,7 @@ static ssize_t n_tty_read(struct tty_str
+  *		  lock themselves)
+  */
+ 
+-static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
++static ssize_t noinline kpatch_n_tty_write(struct tty_struct *tty, struct file *file,
+ 			   const unsigned char *buf, size_t nr)
+ {
+ 	const unsigned char *b = buf;
+@@ -2385,6 +2385,12 @@ break_out:
+ 	return (b - buf) ? b - buf : retval;
+ }
+ 
++static ssize_t __attribute__((optimize("-fno-optimize-sibling-calls"))) n_tty_write(struct tty_struct *tty, struct file *file,
++			   							     const unsigned char *buf, size_t nr)
++{
++	return kpatch_n_tty_write(tty, file, buf, nr);
++}
++
+ /**
+  *	n_tty_poll		-	poll method for N_TTY
+  *	@tty: terminal device
diff --git a/test/integration/rhel-8.6/new-globals.patch b/test/integration/rhel-8.6/new-globals.patch
new file mode 100644
index 0000000..6b70151
--- /dev/null
+++ b/test/integration/rhel-8.6/new-globals.patch
@@ -0,0 +1,34 @@
+diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c
+--- src.orig/fs/proc/cmdline.c	2022-04-29 16:08:21.408780547 -0400
++++ src/fs/proc/cmdline.c	2022-04-29 16:09:10.382954829 -0400
+@@ -17,3 +17,10 @@ static int __init proc_cmdline_init(void
+ 	return 0;
+ }
+ fs_initcall(proc_cmdline_init);
++
++#include <linux/printk.h>
++void kpatch_print_message(void)
++{
++	if (!jiffies)
++		printk("hello there!\n");
++}
+diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
+--- src.orig/fs/proc/meminfo.c	2022-04-29 16:08:21.409780550 -0400
++++ src/fs/proc/meminfo.c	2022-04-29 16:09:10.382954829 -0400
+@@ -21,6 +21,8 @@
+ #include <asm/pgtable.h>
+ #include "internal.h"
+ 
++void kpatch_print_message(void);
++
+ void __attribute__((weak)) arch_report_meminfo(struct seq_file *m)
+ {
+ }
+@@ -57,6 +59,7 @@ static int meminfo_proc_show(struct seq_
+ 	sreclaimable = global_node_page_state_pages(NR_SLAB_RECLAIMABLE_B);
+ 	sunreclaim = global_node_page_state_pages(NR_SLAB_UNRECLAIMABLE_B);
+ 
++	kpatch_print_message();
+ 	show_val_kb(m, "MemTotal:       ", i.totalram);
+ 	show_val_kb(m, "MemFree:        ", i.freeram);
+ 	show_val_kb(m, "MemAvailable:   ", available);
diff --git a/test/integration/rhel-8.6/parainstructions-section.patch b/test/integration/rhel-8.6/parainstructions-section.patch
new file mode 100644
index 0000000..ada24c0
--- /dev/null
+++ b/test/integration/rhel-8.6/parainstructions-section.patch
@@ -0,0 +1,11 @@
+diff -Nupr src.orig/fs/proc/generic.c src/fs/proc/generic.c
+--- src.orig/fs/proc/generic.c	2022-04-29 16:08:21.409780550 -0400
++++ src/fs/proc/generic.c	2022-04-29 16:09:12.837963565 -0400
+@@ -205,6 +205,7 @@ int proc_alloc_inum(unsigned int *inum)
+ {
+ 	int i;
+ 
++	printk("kpatch-test: testing change to .parainstructions section\n");
+ 	i = ida_simple_get(&proc_inum_ida, 0, UINT_MAX - PROC_DYNAMIC_FIRST + 1,
+ 			   GFP_KERNEL);
+ 	if (i < 0)
diff --git a/test/integration/rhel-8.6/shadow-newpid-LOADED.test b/test/integration/rhel-8.6/shadow-newpid-LOADED.test
new file mode 100755
index 0000000..c07d112
--- /dev/null
+++ b/test/integration/rhel-8.6/shadow-newpid-LOADED.test
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grep -q newpid: /proc/$$/status
diff --git a/test/integration/rhel-8.6/shadow-newpid.patch b/test/integration/rhel-8.6/shadow-newpid.patch
new file mode 100644
index 0000000..50d8adf
--- /dev/null
+++ b/test/integration/rhel-8.6/shadow-newpid.patch
@@ -0,0 +1,75 @@
+diff -Nupr src.orig/fs/proc/array.c src/fs/proc/array.c
+--- src.orig/fs/proc/array.c	2022-04-29 16:08:21.408780547 -0400
++++ src/fs/proc/array.c	2022-04-29 16:09:15.255972171 -0400
+@@ -372,12 +372,19 @@ static inline void task_seccomp(struct s
+ 	seq_putc(m, '\n');
+ }
+ 
++#include <linux/livepatch.h>
+ static inline void task_context_switch_counts(struct seq_file *m,
+ 						struct task_struct *p)
+ {
++	int *newpid;
++
+ 	seq_put_decimal_ull(m, "voluntary_ctxt_switches:\t", p->nvcsw);
+ 	seq_put_decimal_ull(m, "\nnonvoluntary_ctxt_switches:\t", p->nivcsw);
+ 	seq_putc(m, '\n');
++
++	newpid = klp_shadow_get(p, 0);
++	if (newpid)
++		seq_printf(m, "newpid:\t%d\n", *newpid);
+ }
+ 
+ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
+diff -Nupr src.orig/kernel/exit.c src/kernel/exit.c
+--- src.orig/kernel/exit.c	2022-04-29 16:08:21.572781130 -0400
++++ src/kernel/exit.c	2022-04-29 16:09:15.256972174 -0400
+@@ -703,6 +703,7 @@ static void check_stack_usage(void)
+ static inline void check_stack_usage(void) {}
+ #endif
+ 
++#include <linux/livepatch.h>
+ void __noreturn do_exit(long code)
+ {
+ 	struct task_struct *tsk = current;
+@@ -803,6 +804,8 @@ void __noreturn do_exit(long code)
+ 	exit_task_work(tsk);
+ 	exit_thread(tsk);
+ 
++	klp_shadow_free(tsk, 0, NULL);
++
+ 	/*
+ 	 * Flush inherited counters to the parent - before the parent
+ 	 * gets woken up by child-exit notifications.
+diff -Nupr src.orig/kernel/fork.c src/kernel/fork.c
+--- src.orig/kernel/fork.c	2022-04-29 16:08:21.572781130 -0400
++++ src/kernel/fork.c	2022-04-29 16:09:15.256972174 -0400
+@@ -2364,6 +2364,7 @@ struct mm_struct *copy_init_mm(void)
+  * It copies the process, and if successful kick-starts
+  * it and waits for it to finish using the VM if required.
+  */
++#include <linux/livepatch.h>
+ long _do_fork(unsigned long clone_flags,
+ 	      unsigned long stack_start,
+ 	      unsigned long stack_size,
+@@ -2376,6 +2377,8 @@ long _do_fork(unsigned long clone_flags,
+ 	struct task_struct *p;
+ 	int trace = 0;
+ 	long nr;
++	int *newpid;
++	static int ctr = 0;
+ 
+ 	/*
+ 	 * Determine whether and which event to report to ptracer.  When
+@@ -2402,6 +2405,11 @@ long _do_fork(unsigned long clone_flags,
+ 	if (IS_ERR(p))
+ 		return PTR_ERR(p);
+ 
++	newpid = klp_shadow_get_or_alloc(p, 0, sizeof(*newpid), GFP_KERNEL,
++					 NULL, NULL);
++	if (newpid)
++		*newpid = ctr++;
++
+ 	/*
+ 	 * Do this prior waking up the new thread - the thread pointer
+ 	 * might get invalid after that point, if the thread exits quickly.
diff --git a/test/integration/rhel-8.6/smp-locks-section.patch b/test/integration/rhel-8.6/smp-locks-section.patch
new file mode 100644
index 0000000..8c6272d
--- /dev/null
+++ b/test/integration/rhel-8.6/smp-locks-section.patch
@@ -0,0 +1,13 @@
+diff -Nupr src.orig/drivers/tty/tty_buffer.c src/drivers/tty/tty_buffer.c
+--- src.orig/drivers/tty/tty_buffer.c	2022-04-29 16:08:21.287780116 -0400
++++ src/drivers/tty/tty_buffer.c	2022-04-29 16:09:17.674980779 -0400
+@@ -256,6 +256,9 @@ static int __tty_buffer_request_room(str
+ 	struct tty_buffer *b, *n;
+ 	int left, change;
+ 
++	if (!size)
++		printk("kpatch-test: testing .smp_locks section changes\n");
++
+ 	b = buf->tail;
+ 	if (b->flags & TTYB_NORMAL)
+ 		left = 2 * b->size - b->used;
diff --git a/test/integration/rhel-8.6/special-static.patch b/test/integration/rhel-8.6/special-static.patch
new file mode 100644
index 0000000..ba6e75a
--- /dev/null
+++ b/test/integration/rhel-8.6/special-static.patch
@@ -0,0 +1,22 @@
+diff -Nupr src.orig/kernel/fork.c src/kernel/fork.c
+--- src.orig/kernel/fork.c	2022-04-29 16:08:21.572781130 -0400
++++ src/kernel/fork.c	2022-04-29 16:09:20.112989455 -0400
+@@ -1579,10 +1579,18 @@ static void posix_cpu_timers_init_group(
+ 	posix_cputimers_group_init(pct, cpu_limit);
+ }
+ 
++void kpatch_foo(void)
++{
++	if (!jiffies)
++		printk("kpatch copy signal\n");
++}
++
+ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
+ {
+ 	struct signal_struct *sig;
+ 
++	kpatch_foo();
++
+ 	if (clone_flags & CLONE_THREAD)
+ 		return 0;
+ 
diff --git a/test/integration/rhel-8.6/symvers-disagreement-FAIL.patch b/test/integration/rhel-8.6/symvers-disagreement-FAIL.patch
new file mode 100644
index 0000000..04b7567
--- /dev/null
+++ b/test/integration/rhel-8.6/symvers-disagreement-FAIL.patch
@@ -0,0 +1,46 @@
+From 2d6b7bce089e52563bd9c67df62f48e90b48047d Mon Sep 17 00:00:00 2001
+From: Julien Thierry <jthierry@redhat.com>
+Date: Wed, 6 May 2020 14:30:57 +0100
+Subject: [PATCH] Symbol version change
+
+This change causes:
+1) Some exported symbols in drivers/base/core.c to see their CRCs
+   change.
+2) Changes usb_get_dev() referencing a get_device() whose CRC has
+   changed, causing the symbol and the new CRC to be included in the
+   __version section of the final module.
+
+This makes the final module unloadable for the target kernel.
+
+See "Exported symbol versioning" of the patch author guide for more
+detail.
+
+---
+ drivers/base/core.c    | 2 ++
+ drivers/usb/core/usb.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff -Nupr src.orig/drivers/base/core.c src/drivers/base/core.c
+--- src.orig/drivers/base/core.c	2022-04-29 16:08:20.289776564 -0400
++++ src/drivers/base/core.c	2022-04-29 16:09:22.510997989 -0400
+@@ -33,6 +33,8 @@
+ #include "base.h"
+ #include "power/power.h"
+ 
++#include <linux/blktrace_api.h>
++
+ #ifdef CONFIG_SYSFS_DEPRECATED
+ #ifdef CONFIG_SYSFS_DEPRECATED_V2
+ long sysfs_deprecated = 1;
+diff -Nupr src.orig/drivers/usb/core/usb.c src/drivers/usb/core/usb.c
+--- src.orig/drivers/usb/core/usb.c	2022-04-29 16:08:21.297780151 -0400
++++ src/drivers/usb/core/usb.c	2022-04-29 16:09:22.510997989 -0400
+@@ -739,6 +739,8 @@ EXPORT_SYMBOL_GPL(usb_alloc_dev);
+  */
+ struct usb_device *usb_get_dev(struct usb_device *dev)
+ {
++	barrier();
++
+ 	if (dev)
+ 		get_device(&dev->dev);
+ 	return dev;
diff --git a/test/integration/rhel-8.6/syscall-LOADED.test b/test/integration/rhel-8.6/syscall-LOADED.test
new file mode 100755
index 0000000..3a2fd88
--- /dev/null
+++ b/test/integration/rhel-8.6/syscall-LOADED.test
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+uname -s | grep -q kpatch
diff --git a/test/integration/rhel-8.6/syscall.patch b/test/integration/rhel-8.6/syscall.patch
new file mode 100644
index 0000000..1494888
--- /dev/null
+++ b/test/integration/rhel-8.6/syscall.patch
@@ -0,0 +1,25 @@
+diff -Nupr src.orig/kernel/sys.c src/kernel/sys.c
+--- src.orig/kernel/sys.c	2022-04-29 16:10:59.577343400 -0400
++++ src/kernel/sys.c	2022-04-29 16:10:59.917344609 -0400
+@@ -1241,14 +1241,18 @@ static int override_release(char __user
+ 	return ret;
+ }
+ 
+-SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name)
++#include "kpatch-syscall.h"
++KPATCH_SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name)
+ {
++	struct new_utsname tmp;
+ 	int errno = 0;
+ 
+ 	down_read(&uts_sem);
+-	if (copy_to_user(name, utsname(), sizeof *name))
+-		errno = -EFAULT;
++	memcpy(&tmp, utsname(), sizeof(tmp));
+ 	up_read(&uts_sem);
++	strcat(tmp.sysname, ".kpatch");
++	if (copy_to_user(name, &tmp, sizeof(tmp)))
++		errno = -EFAULT;
+ 
+ 	if (!errno && override_release(name->release, sizeof(name->release)))
+ 		errno = -EFAULT;
diff --git a/test/integration/rhel-8.6/tracepoints-section.patch b/test/integration/rhel-8.6/tracepoints-section.patch
new file mode 100644
index 0000000..9d60262
--- /dev/null
+++ b/test/integration/rhel-8.6/tracepoints-section.patch
@@ -0,0 +1,13 @@
+diff -Nupr src.orig/kernel/time/timer.c src/kernel/time/timer.c
+--- src.orig/kernel/time/timer.c	2022-04-29 16:08:21.581781162 -0400
++++ src/kernel/time/timer.c	2022-04-29 16:09:24.914006540 -0400
+@@ -1747,6 +1747,9 @@ static __latent_entropy void run_timer_s
+ {
+ 	struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
+ 
++	if (!base)
++		printk("kpatch-test: testing __tracepoints section changes\n");
++
+ 	__run_timers(base);
+ 	if (IS_ENABLED(CONFIG_NO_HZ_COMMON))
+ 		__run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));
diff --git a/test/integration/rhel-8.6/warn-detect-FAIL.patch b/test/integration/rhel-8.6/warn-detect-FAIL.patch
new file mode 100644
index 0000000..2245584
--- /dev/null
+++ b/test/integration/rhel-8.6/warn-detect-FAIL.patch
@@ -0,0 +1,9 @@
+diff -Nupr src.orig/arch/x86/kvm/x86.c src/arch/x86/kvm/x86.c
+--- src.orig/arch/x86/kvm/x86.c	2022-04-29 16:08:20.241776394 -0400
++++ src/arch/x86/kvm/x86.c	2022-04-29 16:09:27.340015174 -0400
+@@ -1,4 +1,5 @@
+ // SPDX-License-Identifier: GPL-2.0-only
++
+ /*
+  * Kernel-based Virtual Machine driver for Linux
+  *