]> www.infradead.org Git - users/hch/misc.git/commit
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 05:00:58 +0000 (15:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 05:00:58 +0000 (15:00 +1000)
commit825f994afa402341eaaf38e31286e6f8394e693c
tree2239103df00089842158d655d885d23ba14d194f
parent7ab8f3cbc19c4f3f2e787837c917cd7b0a941f33
parent591683d3944c07236c80cca2a0702ba9250ee1fa
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

# Conflicts:
# kernel/kexec_file.c
include/linux/kexec.h
kernel/kexec_file.c