Hi Rusty, Today's linux-next merge of the rr tree got a conflict in arch/s390/Kconfig between commit 867c2dcb369b ("s390/seccomp: add support for system call filtering using BPF") from the s390 tree and commit d673c23ca730 ("Make most arch asm/module.h files use asm-generic/module.h") from the rr tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc arch/s390/Kconfig index 107610e,11cc724..0000000 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@@ -124,7 -123,8 +124,9 @@@ config S39 select GENERIC_TIME_VSYSCALL select GENERIC_CLOCKEVENTS select KTIME_SCALAR if 32BIT + select HAVE_ARCH_SECCOMP_FILTER + select HAVE_MOD_ARCH_SPECIFIC + select MODULES_USE_ELF_RELA config SCHED_OMIT_FRAME_POINTER def_bool y
Attachment:
pgpasPhJDfOQx.pgp
Description: PGP signature