From: Andrew Morton Signed-off-by: Andrew Morton --- include/linux/sched.h | 6 ------ 1 file changed, 6 deletions(-) diff -puN include/linux/sched.h~git-parisc-fixup include/linux/sched.h --- a/include/linux/sched.h~git-parisc-fixup +++ a/include/linux/sched.h @@ -1329,12 +1329,6 @@ extern int kill_pid_info(int sig, struct extern int kill_pid_info_as_uid(int, struct siginfo *, struct pid *, uid_t, uid_t, u32); extern int kill_pgrp(struct pid *pid, int sig, int priv); extern int kill_pid(struct pid *pid, int sig, int priv); -<<<<<<< HEAD/include/linux/sched.h -======= -extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp); -extern int kill_pg_info(int, struct siginfo *, pid_t); -extern int kill_proc_info(int, struct siginfo *, pid_t); ->>>>>>> /include/linux/sched.h extern void do_notify_parent(struct task_struct *, int); extern void force_sig(int, struct task_struct *); extern void force_sig_specific(int, struct task_struct *); _