Merge branch 'akpm' (incoming from Andrew)
Merge misc updates from Andrew Morton: - a few hotfixes - dynamic-debug updates - ipc updates - various other sweepings off the factory floor * akpm: (31 commits) firmware/google: drop 'select EFI' to avoid recursive dependency compat: fix sys_fanotify_mark checkpatch.pl: check for function declarations without arguments mm/migrate.c: fix setting of cpupid on page migration twice against normal page softirq: use const char * const for softirq_to_name, whitespace neatening softirq: convert printks to pr_<level> softirq: use ffs() in __do_softirq() kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str() splice: fix unexpected size truncation ipc: fix compat msgrcv with negative msgtyp ipc,msg: document barriers ipc: delete seq_max field in struct ipc_ids ipc: simplify sysvipc_proc_open() return ipc: remove useless return statement ipc: remove braces for single statements ipc: standardize code comments ipc: whitespace cleanup ipc: change kern_ipc_perm.deleted type to bool ipc: introduce ipc_valid_object() helper to sort out IPC_RMID races ipc/sem.c: avoid overflow of semop undo (semadj) value ...
Showing
- arch/arm/kernel/setup.c 1 addition, 1 deletionarch/arm/kernel/setup.c
- arch/unicore32/kernel/early_printk.c 1 addition, 7 deletionsarch/unicore32/kernel/early_printk.c
- arch/x86/include/asm/page_types.h 2 additions, 2 deletionsarch/x86/include/asm/page_types.h
- arch/x86/kernel/setup.c 1 addition, 1 deletionarch/x86/kernel/setup.c
- drivers/firmware/google/Kconfig 1 addition, 2 deletionsdrivers/firmware/google/Kconfig
- fs/notify/fanotify/fanotify_user.c 2 additions, 2 deletionsfs/notify/fanotify/fanotify_user.c
- fs/ocfs2/namei.c 1 addition, 1 deletionfs/ocfs2/namei.c
- include/linux/bootmem.h 37 additions, 0 deletionsinclude/linux/bootmem.h
- include/linux/interrupt.h 1 addition, 1 deletioninclude/linux/interrupt.h
- include/linux/ipc.h 1 addition, 1 deletioninclude/linux/ipc.h
- include/linux/ipc_namespace.h 0 additions, 1 deletioninclude/linux/ipc_namespace.h
- include/linux/msg.h 1 addition, 1 deletioninclude/linux/msg.h
- include/linux/shm.h 1 addition, 1 deletioninclude/linux/shm.h
- include/linux/splice.h 2 additions, 1 deletioninclude/linux/splice.h
- init/main.c 0 additions, 2 deletionsinit/main.c
- ipc/compat.c 15 additions, 15 deletionsipc/compat.c
- ipc/compat_mq.c 1 addition, 1 deletionipc/compat_mq.c
- ipc/ipc_sysctl.c 7 additions, 7 deletionsipc/ipc_sysctl.c
- ipc/mqueue.c 11 additions, 11 deletionsipc/mqueue.c
- ipc/msg.c 30 additions, 14 deletionsipc/msg.c
Loading
Please register or sign in to comment