Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git

sfrothwell · sfrothwell · commit d585728e5de7 · 2025-11-03T11:45:00.000+11:00
diff --git a/security/ipe/hooks.c b/security/ipe/hooks.c
@@ -311,4 +311,4 @@ int ipe_inode_setintegrity(const struct inode *inode,
 
 	return -EINVAL;
 }
-#endif /* CONFIG_CONFIG_IPE_PROP_FS_VERITY_BUILTIN_SIG */
+#endif /* CONFIG_IPE_PROP_FS_VERITY_BUILTIN_SIG */

Original file line number	Diff line number	Diff line change
`@@ -311,4 +311,4 @@ int ipe_inode_setintegrity(const struct inode *inode,`
`311`	`311`
`312`	`312`	`return -EINVAL;`
`313`	`313`	`}`
`314`		`-#endif /* CONFIG_CONFIG_IPE_PROP_FS_VERITY_BUILTIN_SIG */`
	`314`	`+#endif /* CONFIG_IPE_PROP_FS_VERITY_BUILTIN_SIG */`