Messages in this thread | | | Date | Wed, 20 Feb 2013 22:58:22 +0000 | From | Al Viro <> | Subject | Re: [git pull] signal.git |
| |
On Wed, Feb 20, 2013 at 10:52:14PM +0000, Al Viro wrote: > That's the first pile; another one will come a bit later and will contain > SYSCALL_DEFINE-related patches. Please, pull from > git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal for-linus
For the sake of completeness - one obvious conflict on merge is in arch/x86/Kconfig; suggested resolution is ... select MODULES_USE_ELF_REL if X86_32 select MODULES_USE_ELF_RELA if X86_64 select CLONE_BACKWARDS if X86_32 select ARCH_USE_BUILTIN_BSWAP select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION select OLD_SIGACTION if X86_32 select COMPAT_OLD_SIGACTION if IA32_EMULATION
config INSTRUCTION_DECODER ...
| |