Conflicts: include/linux/init_task.h include/linux/sched.h Resolved-by: Vikram Narayanan <vikram186@gmail.com>