core fixes
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
Note that the shortlog below seems to show a merge artifact - the following two commits are already upstream:
3baf63a: m32r: fix build due to notify_cpu_starting() change 463baa8: powerpc: fix linux-next build failure
this is because the merge-base of this tree is 2e532d68a2, while your tree that merges this is fresher.
I did not want to merge to your latest, to not create an unnecessary merge commit. But i could not find a way either how to generate a proper shortlog either. Did i do some mistake somewhere in the workflow that created this situation? The tree is fine, you should see this when you pull:
$ git merge core-fixes-for-linus Merge made by recursive. include/linux/profile.h | 7 +++++++ kernel/rcupdate.c | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-)
$ gll linus.. 1420dfb: Merge branch 'core-fixes-for-linus' into tmp.tmp 5f86515: rcupdate: fix bug of rcu_barrier*() 8cf7d36: profiling: fix !procfs build 52f4f32: Merge branch 'linus' into core/urgent
i think it's that 52f4f32 merge commit that created this?
Thanks,
Ingo
------------------>
Ingo Molnar (2):
m32r: fix build due to notify_cpu_starting() change
profiling: fix !procfs build
Lai Jiangshan (1):
rcupdate: fix bug of rcu_barrier*()
Stephen Rothwell (1):
powerpc: fix linux-next build failure
arch/m32r/kernel/smpboot.c | 1 + arch/powerpc/include/asm/page.h | 6 +++++- include/linux/profile.h | 7 +++++++ kernel/rcupdate.c | 19 ++++++++++--------- 4 files changed, 23 insertions(+), 10 deletions(-)
arch/m32r/kernel/smpboot.c +1 -0
@@ -40,6 +40,7 @@*/ #include <linux/module.h> +#include <linux/cpu.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/mm.h>
arch/powerpc/include/asm/page.h +5 -1
@@ -10,9 +10,13 @@* 2 of the License, or (at your option) any later version. */ +#ifndef __ASSEMBLY__ +#include <linux/types.h> +#else +#include <asm/types.h> +#endif #include <asm/asm-compat.h> #include <asm/kdump.h> -#include <asm/types.h> /* * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software
include/linux/profile.h +7 -0
@@ -37,7 +37,14 @@ extern int prof_on __read_mostly;/* init basic kernel profiler */ int profile_init (void );int profile_setup (char *str); +#ifdef CONFIG_PROC_FS int create_proc_profile (void ); +#else +static inline int create_proc_profile (void ) +{ +return 0 ; +} +#endif void profile_tick (int type);/*
kernel/rcupdate.c +10 -9
@@ -119,18 +119,19 @@ static void _rcu_barrier(enum rcu_barrier type)/* Take cpucontrol mutex to protect against CPU hotplug */ mutex_lock (&rcu_barrier_mutex);init_completion (&rcu_barrier_completion); -atomic_set (&rcu_barrier_cpu_count,0 );/* -* The queueing of callbacks in all CPUs must be atomic with -* respect to RCU, otherwise one CPU may queue a callback, -* wait for a grace period, decrement barrier count and call -* complete(), while other CPUs have not yet queued anything. -* So, we need to make sure that grace periods cannot complete -* until all the callbacks are queued. +* Initialize rcu_barrier_cpu_count to 1, then invoke +* rcu_barrier_func() on each CPU, so that each CPU also has +* incremented rcu_barrier_cpu_count. Only then is it safe to +* decrement rcu_barrier_cpu_count -- otherwise the first CPU +* might complete its grace period before all of the other CPUs +* did their increment, causing this function to return too +* early. */ -rcu_read_lock (); +atomic_set (&rcu_barrier_cpu_count,1 );on_each_cpu (rcu_barrier_func, (void *)type,1 ); -rcu_read_unlock (); +if (atomic_dec_and_test (&rcu_barrier_cpu_count)) +complete (&rcu_barrier_completion);wait_for_completion (&rcu_barrier_completion);mutex_unlock (&rcu_barrier_mutex); }
Quoted 7 lines · Ingo Molnar
this is because the merge-base of this tree is
2e532d68a2, while your tree that merges this is fresher.I did not want to merge to your latest, to not create an unnecessary merge commit. But i could not find a way either how to generate a proper shortlog either.
Just do
# update the remote branches git fetch linus # get the log difference git shortlog linus..
because "git log" and friends don't care about the merge base, they only care about the actual commit _set_difference_. So "linus.." is shorthand for "linus..HEAD", which in turn means "Which commits are in HEAD but not in 'linus".
Doing a _diff_ is different, and when you do "git diff linus.." doesn't mean a set difference, it means an "endpoint difference", and there you need to find the merge base in order to get a sane answer. Of course, then the diff won't necessarily be what I see, since common commits will disappear. But even there, you can do
git diff linus...
where the triple dots mean "symmetric set difference" for a log-based (ie "set operation") operation, but means "difference from common merge base" for an endpoint operation (ie "git diff").
Linus