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

2013-03-18 Thread Arnd Bergmann
On Monday 18 March 2013, Stephen Warren wrote: > On 03/17/2013 10:31 PM, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the tegra tree got a conflict in > > drivers/clocksource/tegra20_timer.c between commit 1d16cfb3aeba > > ("clocksource: tegra20: use the device_node po

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

2013-03-18 Thread Stephen Warren
On 03/17/2013 10:31 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tegra tree got a conflict in > drivers/clocksource/tegra20_timer.c between commit 1d16cfb3aeba > ("clocksource: tegra20: use the device_node pointer passed to > init") from the arm-soc tree and commit 6

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

2013-01-16 Thread Olof Johansson
On Wed, Jan 16, 2013 at 9:08 AM, Stephen Warren wrote: > On 01/16/2013 09:27 AM, Olof Johansson wrote: >> Hi, >> >> On Tue, Jan 15, 2013 at 8:52 PM, Tony Prisk wrote: >>> On Tue, 2013-01-15 at 21:32 -0700, Stephen Warren wrote: On 01/15/2013 08:49 PM, Tony Prisk wrote: > On Wed, 2013-01-

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

2013-01-16 Thread Stephen Warren
On 01/16/2013 09:27 AM, Olof Johansson wrote: > Hi, > > On Tue, Jan 15, 2013 at 8:52 PM, Tony Prisk wrote: >> On Tue, 2013-01-15 at 21:32 -0700, Stephen Warren wrote: >>> On 01/15/2013 08:49 PM, Tony Prisk wrote: On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote: > Hi all, >

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

2013-01-16 Thread Olof Johansson
Hi, On Tue, Jan 15, 2013 at 8:52 PM, Tony Prisk wrote: > On Tue, 2013-01-15 at 21:32 -0700, Stephen Warren wrote: >> On 01/15/2013 08:49 PM, Tony Prisk wrote: >> > On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote: >> >> Hi all, >> >> >> >> Today's linux-next merge of the tegra tree got a

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

2013-01-15 Thread Tony Prisk
On Tue, 2013-01-15 at 21:32 -0700, Stephen Warren wrote: > On 01/15/2013 08:49 PM, Tony Prisk wrote: > > On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote: > >> Hi all, > >> > >> Today's linux-next merge of the tegra tree got a conflict in > >> drivers/clocksource/Makefile between commit ff

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

2013-01-15 Thread Stephen Warren
On 01/15/2013 08:49 PM, Tony Prisk wrote: > On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the tegra tree got a conflict in >> drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500: >> Move timer code to drivers/clocksource

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

2013-01-15 Thread Tony Prisk
On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tegra tree got a conflict in > drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500: > Move timer code to drivers/clocksource") from the arm-soc tree and commit > ac0fd9eca3

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

2013-01-15 Thread Stephen Rothwell
Hi All, On Wed, 16 Jan 2013 14:10:16 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tegra tree got a conflict in > arch/arm/mach-tegra/board-dt-tegra20.c between commit 1d5cc604f42f ("ARM: > remove mach .handle_irq for GIC users") from the arm-soc tree and commit > ac0fd9eca3b