Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-09 Thread Lee Jones
On Mon, 08 Dec 2014, Stephen Warren wrote: > On 12/08/2014 09:51 AM, Lee Jones wrote: > >On Mon, 08 Dec 2014, Stephen Warren wrote: > ... > >>The primary purpose of the kernel.org linux-rpi.git repo is for > >>staging patches into arm-soc/linux-next. As such, just like any > >>other similar repo,

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-08 Thread Stephen Warren
On 12/08/2014 09:51 AM, Lee Jones wrote: On Mon, 08 Dec 2014, Stephen Warren wrote: ... The primary purpose of the kernel.org linux-rpi.git repo is for staging patches into arm-soc/linux-next. As such, just like any other similar repo, users should expect at least the for-xxx (e.g. for-next) br

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-08 Thread Lee Jones
On Mon, 08 Dec 2014, Stephen Warren wrote: > On 12/08/2014 06:49 AM, Lee Jones wrote: > >On Mon, 08 Dec 2014, Arnd Bergmann wrote: > > > >>On Monday 08 December 2014 13:00:09 Lee Jones wrote: > >>>On Mon, 08 Dec 2014, Arnd Bergmann wrote: > >>> > On Monday 08 December 2014 12:06:19 Stephen Roth

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-08 Thread Stephen Warren
On 12/08/2014 06:49 AM, Lee Jones wrote: On Mon, 08 Dec 2014, Arnd Bergmann wrote: On Monday 08 December 2014 13:00:09 Lee Jones wrote: On Mon, 08 Dec 2014, Arnd Bergmann wrote: On Monday 08 December 2014 12:06:19 Stephen Rothwell wrote: Hi Stephen, Today's linux-next merge of the bcm2835

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-08 Thread Arnd Bergmann
On Monday 08 December 2014 13:49:03 Lee Jones wrote: > On Mon, 08 Dec 2014, Arnd Bergmann wrote: > > > On Monday 08 December 2014 13:00:09 Lee Jones wrote: > > > On Mon, 08 Dec 2014, Arnd Bergmann wrote: > > > > > > > On Monday 08 December 2014 12:06:19 Stephen Rothwell wrote: > > > > > Hi Stephe

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-08 Thread Lee Jones
On Mon, 08 Dec 2014, Arnd Bergmann wrote: > On Monday 08 December 2014 13:00:09 Lee Jones wrote: > > On Mon, 08 Dec 2014, Arnd Bergmann wrote: > > > > > On Monday 08 December 2014 12:06:19 Stephen Rothwell wrote: > > > > Hi Stephen, > > > > > > > > Today's linux-next merge of the bcm2835 tree go

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-08 Thread Arnd Bergmann
On Monday 08 December 2014 13:00:09 Lee Jones wrote: > On Mon, 08 Dec 2014, Arnd Bergmann wrote: > > > On Monday 08 December 2014 12:06:19 Stephen Rothwell wrote: > > > Hi Stephen, > > > > > > Today's linux-next merge of the bcm2835 tree got a conflict in > > > arch/arm/boot/dts/Makefile between

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-08 Thread Lee Jones
On Mon, 08 Dec 2014, Arnd Bergmann wrote: > On Monday 08 December 2014 12:06:19 Stephen Rothwell wrote: > > Hi Stephen, > > > > Today's linux-next merge of the bcm2835 tree got a conflict in > > arch/arm/boot/dts/Makefile between commit 302a5ef29d49 ("ARM: BCM5301X: > > Add DT for Netgear R6300 V

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-08 Thread Arnd Bergmann
On Monday 08 December 2014 12:06:19 Stephen Rothwell wrote: > Hi Stephen, > > Today's linux-next merge of the bcm2835 tree got a conflict in > arch/arm/boot/dts/Makefile between commit 302a5ef29d49 ("ARM: BCM5301X: > Add DT for Netgear R6300 V2") from the arm-soc tree and commit > 6298ed17a404 ("A

linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-12-07 Thread Stephen Rothwell
Hi Stephen, Today's linux-next merge of the bcm2835 tree got a conflict in arch/arm/boot/dts/Makefile between commit 302a5ef29d49 ("ARM: BCM5301X: Add DT for Netgear R6300 V2") from the arm-soc tree and commit 6298ed17a404 ("ARM: bcm2835: Add device tree for Raspberry Pi model B+") from the bcm283

linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-03-09 Thread Mark Brown
Hi Stephen/Rob, Today's linux-next merge of the bcm2835 tree got a conflict in between commit ddb902cc34593ecb ("ARM: centralize common multi-platform kconfig options") from the arm-soc tree and commit d30fe6272183f3cc8b ("ARM: bcm2835: Move to mach-bcm directory") from the bcm2835 tree. Comm

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-03-02 Thread Olof Johansson
On Sun, Mar 2, 2014 at 9:21 PM, Stephen Warren wrote: > On 03/02/2014 06:02 PM, Stephen Rothwell wrote: >> Hi Stephen, >> >> Today's linux-next merge of the bcm2835 tree got a conflict in >> arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM: >> centralize common multi-platform kconf

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-03-02 Thread Stephen Warren
On 03/02/2014 06:02 PM, Stephen Rothwell wrote: > Hi Stephen, > > Today's linux-next merge of the bcm2835 tree got a conflict in > arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM: > centralize common multi-platform kconfig options") and > 0676b21fffd1 ("ARM: bcm2835: enable V6K

linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2014-03-02 Thread Stephen Rothwell
Hi Stephen, Today's linux-next merge of the bcm2835 tree got a conflict in arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM: centralize common multi-platform kconfig options") and 0676b21fffd1 ("ARM: bcm2835: enable V6K instead of plain V6") from the arm-soc tree and commit d30fe62

Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2013-03-18 Thread Stephen Warren
On 03/17/2013 10:04 PM, Stephen Rothwell wrote: > Hi Stephen, > > Today's linux-next merge of the bcm2835 tree got a conflict in > arch/arm/Kconfig between commit 15bc1fe67f66 ("ARM: cns3xxx: > enable multiplatform support") from the arm-soc tree and commit > f1ac922dec7e ("ARM: bcm2835: convert

linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2013-03-17 Thread Stephen Rothwell
Hi Stephen, Today's linux-next merge of the bcm2835 tree got a conflict in arch/arm/Kconfig.debug between commit 29c9b7be7574 ("ARM: cns3xxx: move debug_ll code to include/debug/") from the arm-soc tree and commit f1ac922dec7e ("ARM: bcm2835: convert to multi-platform") from the bcm2835 tree. I f

linux-next: manual merge of the bcm2835 tree with the arm-soc tree

2013-03-17 Thread Stephen Rothwell
Hi Stephen, Today's linux-next merge of the bcm2835 tree got a conflict in arch/arm/Kconfig between commit 15bc1fe67f66 ("ARM: cns3xxx: enable multiplatform support") from the arm-soc tree and commit f1ac922dec7e ("ARM: bcm2835: convert to multi-platform") from the bcm2835 tree. I fixed it up (se