From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Russell King <rmk@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Catalin Marinas <catalin.marinas@arm•com>,
Peter Zijlstra <a.p.zijlstra@chello•nl>,
Ingo Molnar <mingo@elte•hu>
Subject: linux-next: manual merge of the arm tree with Linus' tree
Date: Tue, 13 Mar 2012 11:08:40 +1100 [thread overview]
Message-ID: <20120313110840.7b444deb6b1bb902c15f3cdf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 921 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc kernel/sched/core.c
index b342f57,ea13a09..0000000
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -1932,6 -1932,8 +1932,7 @@@ static void finish_task_switch(struct r
local_irq_enable();
#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */
finish_lock_switch(rq, prev);
+ finish_arch_post_lock_switch();
- trace_sched_stat_sleeptime(current, rq->clock);
fire_sched_in_preempt_notifiers(current);
if (mm)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-13 0:08 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-13 0:08 Stephen Rothwell [this message]
2012-03-13 6:16 ` linux-next: manual merge of the arm tree with Linus' tree Ingo Molnar
2012-03-13 8:33 ` Russell King
2012-03-13 8:36 ` Ingo Molnar
2012-03-13 8:47 ` Russell King
2012-03-13 8:56 ` Ingo Molnar
2012-03-13 9:00 ` Russell King
2012-03-13 9:26 ` [GIT PULL/NEXT] sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback Ingo Molnar
2012-03-13 9:50 ` Russell King
2012-03-13 10:19 ` Ingo Molnar
2012-03-13 11:27 ` Russell King
2012-03-13 11:56 ` Ingo Molnar
2012-03-13 12:00 ` Russell King
2012-03-13 12:20 ` Ingo Molnar
2012-03-13 12:36 ` Russell King
2012-03-13 13:02 ` Ingo Molnar
2012-03-13 12:10 ` Ingo Molnar
2012-03-13 12:17 ` Russell King
2012-03-13 12:44 ` Ingo Molnar
2012-03-13 13:04 ` Russell King
2012-03-13 13:31 ` Ingo Molnar
2012-03-13 15:47 ` Ingo Molnar
2012-03-30 13:52 ` Catalin Marinas
2012-03-30 14:25 ` Ingo Molnar
2012-03-30 17:21 ` Catalin Marinas
2012-03-13 11:11 ` Catalin Marinas
2012-03-13 8:48 ` linux-next: manual merge of the arm tree with Linus' tree Ingo Molnar
2012-03-13 8:58 ` Russell King
2012-03-13 9:06 ` Ingo Molnar
2012-03-13 9:09 ` Russell King
2012-03-13 9:11 ` Russell King
-- strict thread matches above, loose matches on Subject: below --
2025-03-26 23:50 Stephen Rothwell
2022-03-08 22:35 Stephen Rothwell
2020-05-27 23:09 Stephen Rothwell
2020-05-27 23:22 ` Russell King - ARM Linux admin
2020-05-28 7:01 ` Ard Biesheuvel
2020-05-30 8:41 ` Russell King - ARM Linux admin
2020-05-30 8:51 ` Ard Biesheuvel
2020-05-30 9:17 ` Russell King - ARM Linux admin
2020-05-30 9:53 ` Stephen Rothwell
2020-05-30 10:25 ` Ard Biesheuvel
2016-06-01 0:07 Stephen Rothwell
2016-06-01 8:52 ` Russell King
2012-03-30 0:11 Stephen Rothwell
2012-03-26 0:05 Stephen Rothwell
2012-01-29 23:38 Stephen Rothwell
2012-01-08 23:53 Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus tree Stephen Rothwell
2012-01-08 23:53 linux-next: manual merge of the arm tree with Linus' tree Stephen Rothwell
2011-12-20 23:08 Stephen Rothwell
2011-09-21 0:33 Stephen Rothwell
2011-09-21 9:31 ` Linus Walleij
2010-07-13 0:51 Stephen Rothwell
2010-03-03 23:49 Stephen Rothwell
2010-03-04 1:16 ` Eric Miao
2010-03-03 23:33 Stephen Rothwell
2009-07-31 0:33 Stephen Rothwell
2009-07-31 0:41 ` H Hartley Sweeten
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120313110840.7b444deb6b1bb902c15f3cdf@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=a.p.zijlstra@chello$(echo .)nl \
--cc=catalin.marinas@arm$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rmk@arm$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox