Conflicts: drivers/platform/x86/intel/ifs/core.c drivers/platform/x86/intel/ifs/ifs.h kernel/sched/core.c