diff --git a/srcpkgs/zfs/patches/linux5.12-00.patch b/srcpkgs/zfs/patches/linux5.12-00.patch
index 68ec99f84c..6aecb31492 100644
--- a/srcpkgs/zfs/patches/linux5.12-00.patch
+++ b/srcpkgs/zfs/patches/linux5.12-00.patch
@@ -49,7 +49,7 @@ Signed-off-by: Jonathon Fernyhough <jonathon@m2x.dev>
create mode 100644 config/kernel-mknod.m4
create mode 100644 config/kernel-symlink.m4
-diff --git config/kernel-generic_fillattr.m4 config/kernel-generic_fillattr.m4
+diff --git a/config/kernel-generic_fillattr.m4 b/config/kernel-generic_fillattr.m4
new file mode 100644
index 00000000000..50c8031305b
--- /dev/null
@@ -83,7 +83,7 @@ index 00000000000..50c8031305b
+ ])
+])
+
-diff --git config/kernel-inode-create.m4 config/kernel-inode-create.m4
+diff --git a/config/kernel-inode-create.m4 b/config/kernel-inode-create.m4
index 9f28bcbd4f7..a6ea11fb61b 100644
--- a/config/kernel-inode-create.m4
+++ b/config/kernel-inode-create.m4
@@ -142,7 +142,7 @@ index 9f28bcbd4f7..a6ea11fb61b 100644
+ ])
])
])
-diff --git config/kernel-inode-getattr.m4 config/kernel-inode-getattr.m4
+diff --git a/config/kernel-inode-getattr.m4 b/config/kernel-inode-getattr.m4
index 48391d66f8b..f62e82f5230 100644
--- a/config/kernel-inode-getattr.m4
+++ b/config/kernel-inode-getattr.m4
@@ -228,7 +228,7 @@ index 48391d66f8b..f62e82f5230 100644
])
])
])
-diff --git config/kernel-is_owner_or_cap.m4 config/kernel-is_owner_or_cap.m4
+diff --git a/config/kernel-is_owner_or_cap.m4 b/config/kernel-is_owner_or_cap.m4
index 3df6163da27..3c3c6ad2240 100644
--- a/config/kernel-is_owner_or_cap.m4
+++ b/config/kernel-is_owner_or_cap.m4
@@ -267,7 +267,7 @@ index 3df6163da27..3c3c6ad2240 100644
+ ])
])
])
-diff --git config/kernel-mkdir-umode-t.m4 config/kernel-mkdir-umode-t.m4
+diff --git a/config/kernel-mkdir-umode-t.m4 b/config/kernel-mkdir-umode-t.m4
deleted file mode 100644
index 19599670df3..00000000000
--- a/config/kernel-mkdir-umode-t.m4
@@ -305,7 +305,7 @@ index 19599670df3..00000000000
- ZFS_LINUX_TEST_ERROR([mkdir()])
- ])
-])
-diff --git config/kernel-mkdir.m4 config/kernel-mkdir.m4
+diff --git a/config/kernel-mkdir.m4 b/config/kernel-mkdir.m4
new file mode 100644
index 00000000000..a162bcd880f
--- /dev/null
@@ -376,7 +376,7 @@ index 00000000000..a162bcd880f
+ ])
+ ])
+])
-diff --git config/kernel-mknod.m4 config/kernel-mknod.m4
+diff --git a/config/kernel-mknod.m4 b/config/kernel-mknod.m4
new file mode 100644
index 00000000000..ffe45106003
--- /dev/null
@@ -412,7 +412,7 @@ index 00000000000..ffe45106003
+ AC_MSG_RESULT(no)
+ ])
+])
-diff --git config/kernel-rename.m4 config/kernel-rename.m4
+diff --git a/config/kernel-rename.m4 b/config/kernel-rename.m4
index f707391539d..31d199f33bb 100644
--- a/config/kernel-rename.m4
+++ b/config/kernel-rename.m4
@@ -481,7 +481,7 @@ index f707391539d..31d199f33bb 100644
+ ])
])
])
-diff --git config/kernel-setattr-prepare.m4 config/kernel-setattr-prepare.m4
+diff --git a/config/kernel-setattr-prepare.m4 b/config/kernel-setattr-prepare.m4
index 45408c45c69..24245aa5344 100644
--- a/config/kernel-setattr-prepare.m4
+++ b/config/kernel-setattr-prepare.m4
@@ -548,7 +548,7 @@ index 45408c45c69..24245aa5344 100644
+ ])
])
])
-diff --git config/kernel-symlink.m4 config/kernel-symlink.m4
+diff --git a/config/kernel-symlink.m4 b/config/kernel-symlink.m4
new file mode 100644
index 00000000000..d90366d04b7
--- /dev/null
@@ -584,7 +584,7 @@ index 00000000000..d90366d04b7
+ AC_MSG_RESULT(no)
+ ])
+])
-diff --git config/kernel-xattr-handler.m4 config/kernel-xattr-handler.m4
+diff --git a/config/kernel-xattr-handler.m4 b/config/kernel-xattr-handler.m4
index 137bf4a8aff..00b1e74a9cc 100644
--- a/config/kernel-xattr-handler.m4
+++ b/config/kernel-xattr-handler.m4
@@ -694,7 +694,7 @@ index 137bf4a8aff..00b1e74a9cc 100644
])
])
])
-diff --git config/kernel.m4 config/kernel.m4
+diff --git a/config/kernel.m4 b/config/kernel.m4
index 55620b3daa8..51c7fb926ec 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -760,7 +760,7 @@ index 55620b3daa8..51c7fb926ec 100644
])
dnl #
-diff --git include/os/linux/kernel/linux/vfs_compat.h include/os/linux/kernel/linux/vfs_compat.h
+diff --git a/include/os/linux/kernel/linux/vfs_compat.h b/include/os/linux/kernel/linux/vfs_compat.h
index c35e80d31cd..91e908598fb 100644
--- a/include/os/linux/kernel/linux/vfs_compat.h
+++ b/include/os/linux/kernel/linux/vfs_compat.h
@@ -807,7 +807,7 @@ index c35e80d31cd..91e908598fb 100644
+#endif
+
#endif /* _ZFS_VFS_H */
-diff --git include/os/linux/kernel/linux/xattr_compat.h include/os/linux/kernel/linux/xattr_compat.h
+diff --git a/include/os/linux/kernel/linux/xattr_compat.h b/include/os/linux/kernel/linux/xattr_compat.h
index 8348e99198a..54690727eab 100644
--- a/include/os/linux/kernel/linux/xattr_compat.h
+++ b/include/os/linux/kernel/linux/xattr_compat.h
@@ -840,7 +840,7 @@ index 8348e99198a..54690727eab 100644
#define ZPL_XATTR_SET_WRAPPER(fn) \
static int \
fn(const struct xattr_handler *handler, struct dentry *dentry, \
-diff --git include/os/linux/zfs/sys/zfs_vnops_os.h include/os/linux/zfs/sys/zfs_vnops_os.h
+diff --git a/include/os/linux/zfs/sys/zfs_vnops_os.h b/include/os/linux/zfs/sys/zfs_vnops_os.h
index 1c9cdf7bf8f..ba83f5dd83d 100644
--- a/include/os/linux/zfs/sys/zfs_vnops_os.h
+++ b/include/os/linux/zfs/sys/zfs_vnops_os.h
@@ -854,7 +854,7 @@ index 1c9cdf7bf8f..ba83f5dd83d 100644
extern int zfs_setattr(znode_t *zp, vattr_t *vap, int flag, cred_t *cr);
extern int zfs_rename(znode_t *sdzp, char *snm, znode_t *tdzp,
char *tnm, cred_t *cr, int flags);
-diff --git include/os/linux/zfs/sys/zpl.h include/os/linux/zfs/sys/zpl.h
+diff --git a/include/os/linux/zfs/sys/zpl.h b/include/os/linux/zfs/sys/zpl.h
index b0bb9c29c0b..21825d1f378 100644
--- a/include/os/linux/zfs/sys/zpl.h
+++ b/include/os/linux/zfs/sys/zpl.h
@@ -881,7 +881,7 @@ index b0bb9c29c0b..21825d1f378 100644
+#endif
+
#endif /* _SYS_ZPL_H */
-diff --git module/os/linux/zfs/policy.c module/os/linux/zfs/policy.c
+diff --git a/module/os/linux/zfs/policy.c b/module/os/linux/zfs/policy.c
index 8780d7f6c70..bbccb2e572d 100644
--- a/module/os/linux/zfs/policy.c
+++ b/module/os/linux/zfs/policy.c
@@ -894,7 +894,7 @@ index 8780d7f6c70..bbccb2e572d 100644
return (0);
#if defined(CONFIG_USER_NS)
-diff --git module/os/linux/zfs/zfs_vnops_os.c module/os/linux/zfs/zfs_vnops_os.c
+diff --git a/module/os/linux/zfs/zfs_vnops_os.c b/module/os/linux/zfs/zfs_vnops_os.c
index 7484d651c1f..ce0701763fd 100644
--- a/module/os/linux/zfs/zfs_vnops_os.c
+++ b/module/os/linux/zfs/zfs_vnops_os.c
@@ -917,7 +917,7 @@ index 7484d651c1f..ce0701763fd 100644
/*
* +1 link count for root inode with visible '.zfs' directory.
*/
-diff --git module/os/linux/zfs/zpl_ctldir.c module/os/linux/zfs/zpl_ctldir.c
+diff --git a/module/os/linux/zfs/zpl_ctldir.c b/module/os/linux/zfs/zpl_ctldir.c
index e6420f19ed8..9b526afd000 100644
--- a/module/os/linux/zfs/zpl_ctldir.c
+++ b/module/os/linux/zfs/zpl_ctldir.c
@@ -1055,7 +1055,7 @@ index e6420f19ed8..9b526afd000 100644
iput(ZTOI(dzp));
}
-diff --git module/os/linux/zfs/zpl_file.c module/os/linux/zfs/zpl_file.c
+diff --git a/module/os/linux/zfs/zpl_file.c b/module/os/linux/zfs/zpl_file.c
index 80762f9669b..08bf97ff338 100644
--- a/module/os/linux/zfs/zpl_file.c
+++ b/module/os/linux/zfs/zpl_file.c
@@ -1068,7 +1068,7 @@ index 80762f9669b..08bf97ff338 100644
return (-EACCES);
xva_init(xva);
-diff --git module/os/linux/zfs/zpl_inode.c module/os/linux/zfs/zpl_inode.c
+diff --git a/module/os/linux/zfs/zpl_inode.c b/module/os/linux/zfs/zpl_inode.c
index f336fbb1272..364b9fbef24 100644
--- a/module/os/linux/zfs/zpl_inode.c
+++ b/module/os/linux/zfs/zpl_inode.c
@@ -1207,7 +1207,7 @@ index f336fbb1272..364b9fbef24 100644
.rename = zpl_rename2,
#else
.rename = zpl_rename,
-diff --git module/os/linux/zfs/zpl_xattr.c module/os/linux/zfs/zpl_xattr.c
+diff --git a/module/os/linux/zfs/zpl_xattr.c b/module/os/linux/zfs/zpl_xattr.c
index 1ec3dae2bb8..5e35f90df85 100644
--- a/module/os/linux/zfs/zpl_xattr.c
+++ b/module/os/linux/zfs/zpl_xattr.c
diff --git a/srcpkgs/zfs/patches/linux5.12-01.patch b/srcpkgs/zfs/patches/linux5.12-01.patch
index cc4ed3c626..b07f70183c 100644
--- a/srcpkgs/zfs/patches/linux5.12-01.patch
+++ b/srcpkgs/zfs/patches/linux5.12-01.patch
@@ -21,7 +21,7 @@ Signed-off-by: Jonathon Fernyhough <jonathon@m2x.dev>
3 files changed, 30 insertions(+)
create mode 100644 config/kernel-bio_max_segs.m4
-diff --git config/kernel-bio_max_segs.m4 config/kernel-bio_max_segs.m4
+diff --git a/config/kernel-bio_max_segs.m4 b/config/kernel-bio_max_segs.m4
new file mode 100644
index 00000000000..a90d75455c1
--- /dev/null
@@ -50,7 +50,7 @@ index 00000000000..a90d75455c1
+ AC_MSG_RESULT(no)
+ ])
+])
-diff --git config/kernel.m4 config/kernel.m4
+diff --git a/config/kernel.m4 b/config/kernel.m4
index 51c7fb926ec..b8d53490a4a 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -70,7 +70,7 @@ index 51c7fb926ec..b8d53490a4a 100644
])
dnl #
-diff --git module/os/linux/zfs/vdev_disk.c module/os/linux/zfs/vdev_disk.c
+diff --git a/module/os/linux/zfs/vdev_disk.c b/module/os/linux/zfs/vdev_disk.c
index 08c33313407..aaaf4105979 100644
--- a/module/os/linux/zfs/vdev_disk.c
+++ b/module/os/linux/zfs/vdev_disk.c