linux-next: manual merge of the cpuidle-cons tree with the tip tree

linux-next: manual merge of the cpuidle-cons tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]

Hi Rob,

Today's linux-next merge of the cpuidle-cons tree got a conflict in
drivers/cpuidle/cpuidle.c between commit 76027ea863fc ("cpuidle/tracing:
Denote the tracepoints as being in rcu_idle_exit() section") from the tip
tree and commit 9adbc67f6ecf ("cpuidle: Add common time keeping and irq
enabling") from the cpuidle-cons 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 drivers/cpuidle/cpuidle.c
index 6588f43,56de5f7..0000000
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@@ -92,15 -109,13 +109,13 @@@ int cpuidle_idle_call(void
  		return 0;
  	}
  
- 	target_state = &drv->states[next_state];
- 
 -	trace_power_start(POWER_CSTATE, next_state, dev->cpu);
 -	trace_cpu_idle(next_state, dev->cpu);
 +	trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
 +	trace_cpu_idle_rcuidle(next_state, dev->cpu);
  
- 	entered_state = target_state->enter(dev, drv, next_state);
+ 	entered_state = cpuidle_enter_ops(dev, drv, next_state);
  
 -	trace_power_end(dev->cpu);
 -	trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
 +	trace_power_end_rcuidle(dev->cpu);
 +	trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
  
  	if (entered_state >= 0) {
  		/* Update cpuidle counters */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the cpuidle-cons tree with the tip tree

[Steven Rostedt]

On Fri, 2012-03-09 at 18:40 +1100, Stephen Rothwell wrote:
> diff --cc drivers/cpuidle/cpuidle.c
> index 6588f43,56de5f7..0000000
> --- a/drivers/cpuidle/cpuidle.c
> +++ b/drivers/cpuidle/cpuidle.c
> @@@ -92,15 -109,13 +109,13 @@@ int cpuidle_idle_call(void
>                 return 0;
>         }
>   
> -       target_state = &drv->states[next_state];
> - 
>  -      trace_power_start(POWER_CSTATE, next_state, dev->cpu);
>  -      trace_cpu_idle(next_state, dev->cpu);
>  +      trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
>  +      trace_cpu_idle_rcuidle(next_state, dev->cpu);
>   
> -       entered_state = target_state->enter(dev, drv, next_state);
> +       entered_state = cpuidle_enter_ops(dev, drv, next_state);
>   
>  -      trace_power_end(dev->cpu);
>  -      trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
>  +      trace_power_end_rcuidle(dev->cpu);
>  +      trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
>   

Looks good. My change was just a rename of trace_power_* and
trace_cpu_*, and it looks like another change was the clean up of
target_state. This is a trivial conflict, and there should be no
surprises here.

-- Steve



>         if (entered_state >= 0) {
>                 /* Update cpuidle counters */ 

Re: linux-next: manual merge of the cpuidle-cons tree with the tip tree

[Rob Lee]

Steven and Stephen,

On Fri, Mar 9, 2012 at 7:35 AM, Steven Rostedt <srostedt@redhat.com> wrote:
> On Fri, 2012-03-09 at 18:40 +1100, Stephen Rothwell wrote:
>> diff --cc drivers/cpuidle/cpuidle.c
>> index 6588f43,56de5f7..0000000
>> --- a/drivers/cpuidle/cpuidle.c
>> +++ b/drivers/cpuidle/cpuidle.c
>> @@@ -92,15 -109,13 +109,13 @@@ int cpuidle_idle_call(void
>>                 return 0;
>>         }
>>
>> -       target_state = &drv->states[next_state];
>> -
>>  -      trace_power_start(POWER_CSTATE, next_state, dev->cpu);
>>  -      trace_cpu_idle(next_state, dev->cpu);
>>  +      trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
>>  +      trace_cpu_idle_rcuidle(next_state, dev->cpu);
>>
>> -       entered_state = target_state->enter(dev, drv, next_state);
>> +       entered_state = cpuidle_enter_ops(dev, drv, next_state);
>>
>>  -      trace_power_end(dev->cpu);
>>  -      trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
>>  +      trace_power_end_rcuidle(dev->cpu);
>>  +      trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
>>
>
> Looks good. My change was just a rename of trace_power_* and
> trace_cpu_*, and it looks like another change was the clean up of
> target_state. This is a trivial conflict, and there should be no
> surprises here.
>
> -- Steve
>

Looks good to me as well.

Who should carry this fixup?

Best Regards,
Rob

>
>
>>         if (entered_state >= 0) {
>>                 /* Update cpuidle counters */
>

Re: linux-next: manual merge of the cpuidle-cons tree with the tip tree

[Steven Rostedt]

On Mon, 2012-03-12 at 12:06 -0500, Rob Lee wrote:

> 
> Looks good to me as well.
> 
> Who should carry this fixup?

I think it's trivial enough that Linus can handle it. He always said
that he likes to fix merge conflicts and has yelled at people who did
things to prevent them.

-- Steve

Re: linux-next: manual merge of the cpuidle-cons tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 642 bytes --]

Hi Rob,

On Mon, 12 Mar 2012 13:13:23 -0400 Steven Rostedt <srostedt@redhat.com> wrote:
>
> On Mon, 2012-03-12 at 12:06 -0500, Rob Lee wrote:
> 
> > 
> > Looks good to me as well.
> > 
> > Who should carry this fixup?
> 
> I think it's trivial enough that Linus can handle it. He always said
> that he likes to fix merge conflicts and has yelled at people who did
> things to prevent them.

Yeah, I just carry it in my tree and Linus will fix it up when he merges
the trees in his.

[The assumption is that anything I can figure out so can Linus :-)]
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]