Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1208309 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-17 04:20 +0200 |
| Last post | 2015-08-18 04:40 +0200 |
| Articles | 5 — 4 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the thermal-soc tree with the arm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-17 04:20 +0200
Re: linux-next: manual merge of the thermal-soc tree with the arm tree Viresh Kumar <viresh.kumar@linaro.org> - 2015-08-17 04:30 +0200
Re: linux-next: manual merge of the thermal-soc tree with the arm tree Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-17 10:00 +0200
Re: linux-next: manual merge of the thermal-soc tree with the arm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-17 10:10 +0200
Re: linux-next: manual merge of the thermal-soc tree with the arm tree Eduardo Valentin <edubezval@gmail.com> - 2015-08-18 04:40 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-17 04:20 +0200 |
| Subject | linux-next: manual merge of the thermal-soc tree with the arm tree |
| Message-ID | <pYibL-1Tp-7@gated-at.bofh.it> |
Hi Eduardo,
Today's linux-next merge of the thermal-soc tree got a conflict in:
drivers/thermal/cpu_cooling.c
between commit:
df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
from the arm tree and commits:
02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
from the thermal-soc tree.
I fixed it up (the first two look like two versions of the same patch,
so I used the version from the thermal-soc tree) and can carry the fix
as necessary (no action is required).
Russell: that commit in your tree has no Signed-off-by :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Viresh Kumar <viresh.kumar@linaro.org> |
|---|---|
| Date | 2015-08-17 04:30 +0200 |
| Subject | Re: linux-next: manual merge of the thermal-soc tree with the arm tree |
| Message-ID | <pYilr-24F-3@gated-at.bofh.it> |
| In reply to | #1208309 |
On 17-08-15, 12:17, Stephen Rothwell wrote:
> Hi Eduardo,
>
> Today's linux-next merge of the thermal-soc tree got a conflict in:
>
> drivers/thermal/cpu_cooling.c
>
> between commit:
>
> df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>
> from the arm tree and commits:
>
> 02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
> a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
>
> from the thermal-soc tree.
>
> I fixed it up (the first two look like two versions of the same patch,
> so I used the version from the thermal-soc tree) and can carry the fix
> as necessary (no action is required).
Right the version from the thermal tree is the updated version and
should be picked.
> Russell: that commit in your tree has no Signed-off-by :-(
No. It does have a SOB, but that followed a bit of rant/history on why
Russell carried this patch :)
Russell should be dropping that patch soon, AFAIU.
--
viresh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Russell King - ARM Linux <linux@arm.linux.org.uk> |
|---|---|
| Date | 2015-08-17 10:00 +0200 |
| Subject | Re: linux-next: manual merge of the thermal-soc tree with the arm tree |
| Message-ID | <pYnuN-11C-9@gated-at.bofh.it> |
| In reply to | #1208309 |
On Mon, Aug 17, 2015 at 12:17:54PM +1000, Stephen Rothwell wrote:
> Hi Eduardo,
>
> Today's linux-next merge of the thermal-soc tree got a conflict in:
>
> drivers/thermal/cpu_cooling.c
>
> between commit:
>
> df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>
> from the arm tree and commits:
>
> 02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
> a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
>
> from the thermal-soc tree.
>
> I fixed it up (the first two look like two versions of the same patch,
> so I used the version from the thermal-soc tree) and can carry the fix
> as necessary (no action is required).
>
> Russell: that commit in your tree has no Signed-off-by :-(
Yes it does. It's above the explanation of why it's there. However,
now that Eduardo has taken patches to fix the long standing bug, I can
drop this commit.
--
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-17 10:10 +0200 |
| Subject | Re: linux-next: manual merge of the thermal-soc tree with the arm tree |
| Message-ID | <pYnEu-1sk-11@gated-at.bofh.it> |
| In reply to | #1208448 |
Hi Russell, On Mon, 17 Aug 2015 08:55:49 +0100 Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > > Yes it does. It's above the explanation of why it's there. However, > now that Eduardo has taken patches to fix the long standing bug, I can > drop this commit. Ah, yes, I only expect to see them at the end. Sorry about that. And thanks. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Eduardo Valentin <edubezval@gmail.com> |
|---|---|
| Date | 2015-08-18 04:40 +0200 |
| Subject | Re: linux-next: manual merge of the thermal-soc tree with the arm tree |
| Message-ID | <pYEYG-1cr-9@gated-at.bofh.it> |
| In reply to | #1208448 |
Russell,
On Mon, Aug 17, 2015 at 12:55 AM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
> On Mon, Aug 17, 2015 at 12:17:54PM +1000, Stephen Rothwell wrote:
>> Hi Eduardo,
>>
>> Today's linux-next merge of the thermal-soc tree got a conflict in:
>>
>> drivers/thermal/cpu_cooling.c
>>
>> between commit:
>>
>> df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>>
>> from the arm tree and commits:
>>
>> 02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>> a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
>>
>> from the thermal-soc tree.
>>
>> I fixed it up (the first two look like two versions of the same patch,
>> so I used the version from the thermal-soc tree) and can carry the fix
>> as necessary (no action is required).
>>
>> Russell: that commit in your tree has no Signed-off-by :-(
>
> Yes it does. It's above the explanation of why it's there. However,
> now that Eduardo has taken patches to fix the long standing bug, I can
> drop this commit.
>
Thanks once again for the effort to push the fix. Once again, sorry for the inconvenience.
> --
> FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
> according to speedtest.net.
--
Eduardo Bezerra Valentin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web