Re: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees

2015-05-20 Thread Krzysztof Kozlowski
2015-05-20 18:47 GMT+09:00 Geert Uytterhoeven : > On Wed, May 20, 2015 at 11:16 AM, Alexandre Belloni > wrote: >> On 20/05/2015 at 09:35:36 +0900, Krzysztof Kozlowski wrote : >>> 2015-05-20 9:27 GMT+09:00 Stephen Rothwell : >>> > Today's linux-next merge of the samsung tree got a conflict in >>> >

Re: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees

2015-05-20 Thread Geert Uytterhoeven
On Wed, May 20, 2015 at 11:16 AM, Alexandre Belloni wrote: > On 20/05/2015 at 09:35:36 +0900, Krzysztof Kozlowski wrote : >> 2015-05-20 9:27 GMT+09:00 Stephen Rothwell : >> > Today's linux-next merge of the samsung tree got a conflict in >> > arch/arm/configs/multi_v7_defconfig between various com

Re: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees

2015-05-20 Thread Alexandre Belloni
On 20/05/2015 at 09:35:36 +0900, Krzysztof Kozlowski wrote : > 2015-05-20 9:27 GMT+09:00 Stephen Rothwell : > > Hi Kukjin, > > > > Today's linux-next merge of the samsung tree got a conflict in > > arch/arm/configs/multi_v7_defconfig between various commits from the > > arm-soc and at91 trees and v

Re: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees

2015-05-20 Thread Nicolas Ferre
Le 20/05/2015 02:27, Stephen Rothwell a écrit : > Hi Kukjin, > > Today's linux-next merge of the samsung tree got a conflict in > arch/arm/configs/multi_v7_defconfig between various commits from the > arm-soc and at91 trees and various commits from the samsung tree. > > I fixed it up (see below)

Re: linux-next: manual merge of the samsung tree with the arm-soc and at91 trees

2015-05-19 Thread Krzysztof Kozlowski
2015-05-20 9:27 GMT+09:00 Stephen Rothwell : > Hi Kukjin, > > Today's linux-next merge of the samsung tree got a conflict in > arch/arm/configs/multi_v7_defconfig between various commits from the > arm-soc and at91 trees and various commits from the samsung tree. > > I fixed it up (see below) and c

linux-next: manual merge of the samsung tree with the arm-soc and at91 trees

2015-05-19 Thread Stephen Rothwell
Hi Kukjin, Today's linux-next merge of the samsung tree got a conflict in arch/arm/configs/multi_v7_defconfig between various commits from the arm-soc and at91 trees and various commits from the samsung tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -