Merge branch 'core/signal' into perfcounters/core
This is necessary to avoid the conflict of syscall numbers.
Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
Fixes up the borked syscall numbers of perfcounters versus
preadv/pwritev as well.
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Showing
Documentation/isdn/INTERFACE.CAPI
0 → 100644
想要评论请 注册 或 登录