Messages in this thread | | | Date | Tue, 13 Mar 2012 07:16:22 +0100 | From | Ingo Molnar <> | Subject | Re: linux-next: manual merge of the arm tree with Linus' tree |
| |
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Russell, > > Today's linux-next merge of the arm tree got a conflict in > kernel/sched/core.c between commit 8c79a045fd59 ("sched/events: Revert > trace_sched_stat_sleeptime()") from Linus' tree and commit 1cf00341547a > ("sched: Introduce the finish_arch_post_lock_switch() scheduler hook") > from the arm tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
This commit seems simple enough and has PeterZ's ack, but if there are more scheduler patches coming in this area then please send it to the scheduler tree first: we can create a pullable, stable topic branch for it which the ARM tree can then use.
That approach would also avoid conflicts as a side effect.
Thanks,
Ingo
| |