***************************************************
tracking-big-LITTLE-MP-master has 3 conflicts

--------------------------------------------------
diff --cc kernel/sched/core.c
index 0d8eb4525e7616953d1a0df16fd43bcf6fc4f0cc,4c6d44f78c0aca145e86f804e3db906f57451d87..0000000000000000000000000000000000000000
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -1613,6 -1596,19 +1613,22 @@@ static void __sched_fork(struct task_st
  	p->se.vruntime			= 0;
  	INIT_LIST_HEAD(&p->se.group_node);
  
++<<<<<<< HEAD
++=======
+ /*
+  * Load-tracking only depends on SMP, FAIR_GROUP_SCHED dependency below may be
+  * removed when useful for applications beyond shares distribution (e.g.
+  * load-balance).
+  */
+ #if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED)
+ 	p->se.avg.runnable_avg_period = 0;
+ 	p->se.avg.runnable_avg_sum = 0;
+ #ifdef CONFIG_SCHED_HMP
+ 	p->se.avg.hmp_last_up_migration = 0;
+ 	p->se.avg.hmp_last_down_migration = 0;
+ #endif
+ #endif
++>>>>>>> tracking-big-LITTLE-MP-master
  #ifdef CONFIG_SCHEDSTATS
  	memset(&p->se.statistics, 0, sizeof(p->se.statistics));
  #endif
--------------------------------------------------
diff --cc kernel/sched/fair.c
index f77f9c5274494f22b15bade21163a685e80a14e1,90f61d848cb2eb8e5e21f278da1e1f8cd511acdc..0000000000000000000000000000000000000000
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@@ -1535,8 -1673,19 +1711,23 @@@ static void update_cfs_rq_blocked_load(
  
  static inline void update_rq_runnable_avg(struct rq *rq, int runnable)
  {
++<<<<<<< HEAD
 +	__update_entity_runnable_avg(rq_clock_task(rq), &rq->avg, runnable);
++=======
+ 	u32 contrib;
+ 	int cpu = -1;	/* not used in normal case */
+ 
+ #ifdef CONFIG_HMP_FREQUENCY_INVARIANT_SCALE
+ 	cpu = rq->cpu;
+ #endif
+ 	__update_entity_runnable_avg(rq->clock_task, &rq->avg, runnable,
+ 				     runnable, cpu);
++>>>>>>> tracking-big-LITTLE-MP-master
  	__update_tg_runnable_avg(&rq->avg, &rq->cfs);
+ 	contrib = rq->avg.runnable_avg_sum * scale_load_down(1024);
+ 	contrib /= (rq->avg.runnable_avg_period + 1);
+ 	trace_sched_rq_runnable_ratio(cpu_of(rq), scale_load(contrib));
+ 	trace_sched_rq_runnable_load(cpu_of(rq), rq->cfs.runnable_load_avg);
  }
  
  /* Add the load generated by se into cfs_rq's child load-average */
@@@ -3985,8 -4561,7 +4605,12 @@@ int can_migrate_task(struct task_struc
  	 * 1) task is cache cold, or
  	 * 2) too many balance attempts have failed.
  	 */
++<<<<<<< HEAD
 +
 +	tsk_cache_hot = task_hot(p, rq_clock_task(env->src_rq), env->sd);
++=======
+ 	tsk_cache_hot = task_hot(p, env->src_rq->clock_task, env->sd);
++>>>>>>> tracking-big-LITTLE-MP-master
  	if (!tsk_cache_hot ||
  		env->sd->nr_balance_failed > env->sd->cache_nice_tries) {
  
--------------------------------------------------
diff --cc kernel/sched/sched.h
index ef0a7b2439dde25bdd3d4ee54c4801364e09607d,27f51ac86700a65d1327c87482d655300848cdb6..0000000000000000000000000000000000000000
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@@ -148,10 -140,9 +148,16 @@@ struct task_group 
  	struct cfs_rq **cfs_rq;
  	unsigned long shares;
  
++<<<<<<< HEAD
 +#ifdef	CONFIG_SMP
 +	atomic_long_t load_avg;
 +	atomic_t runnable_avg;
++=======
+ 	atomic_t load_weight;
+ 	atomic64_t load_avg;
+ 	atomic_t runnable_avg, usage_avg;
++>>>>>>> tracking-big-LITTLE-MP-master
 +#endif
  #endif
  
  #ifdef CONFIG_RT_GROUP_SCHED
@@@ -276,15 -273,14 +282,20 @@@ struct cfs_rq 
  	 * This allows for the description of both thread and group usage (in
  	 * the FAIR_GROUP_SCHED case).
  	 */
 -	u64 runnable_load_avg, blocked_load_avg;
 -	atomic64_t decay_counter, removed_load;
 +	unsigned long runnable_load_avg, blocked_load_avg;
 +	atomic64_t decay_counter;
  	u64 last_decay;
 -#endif /* CONFIG_FAIR_GROUP_SCHED */
 -/* These always depend on CONFIG_FAIR_GROUP_SCHED */
 +	atomic_long_t removed_load;
 +
  #ifdef CONFIG_FAIR_GROUP_SCHED
++<<<<<<< HEAD
 +	/* Required to track per-cpu representation of a task_group */
 +	u32 tg_runnable_contrib;
 +	unsigned long tg_load_contrib;
++=======
+ 	u32 tg_runnable_contrib, tg_usage_contrib;
+ 	u64 tg_load_contrib;
++>>>>>>> tracking-big-LITTLE-MP-master
  #endif /* CONFIG_FAIR_GROUP_SCHED */
  
  	/*