Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm/configs/tegra_defconfig
between commit:
67c70aa86f8b ("arm/arm64: defconfig: Update configs to use the new CROS_EC
options")
from the arm-soc tree and commit:
3a3cb021b038 ("ARM: tegra_defconfig: Enable opti
Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
39bab7bfb7d9 ("arm64: configs: Remove useless UEVENT_HELPER_PATH")
from the arm-soc tree and commit:
01d6fb565b4a ("arm64: defconfig: Add Tegra194 PCIe driver")
from the t
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm64/configs/defconfig between commit e324654294907a4 ("ARM: use "depends
on" for SoC configs instead of "if" after prompt") from the arm-soc tree and
commit 099a6644f5be4 ("soc/tegra: Provide per-SoC Kconfig symbols") f
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
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
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 6f88fb8af6c6 ("clocksource: tegra: move to
of_clk_get") from th
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/platsmp.c between commits b1cffebf1029 ("ARM: GIC:
remove direct use of gic_raise_softirq") and 520f7bd73354 ("irqchip: Move
ARM gic.h to include/linux/irqchip/arm-gic.h") from the arm-soc tree and
commits 895
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/common.c between commit 0529e315bbda ("ARM: use
common irqchip_init for GIC init") from the arm-soc tree and commits
61fd290d213e ("ARM: tegra: migrate to new clock code") and 5c541b884c09
("ARM: tegra: Add in
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/platsmp.c between commit 520f7bd73354 ("irqchip: Move
ARM gic.h to include/linux/irqchip/arm-gic.h") from the arm-soc tree and
commit 4c6e1ff5b5fe ("ARM: tegra: move tegra_cpu_car.h to
linux/clk/tegra.h") from
Hi all,
Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/common.c between commit 0529e315bbda ("ARM: use
common irqchip_init for GIC init") from the arm-soc tree and commit
567f70da22d2 ("ARM: tegra: migrate to new clock code") from the tegra
tree.
I fixed it up (s
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-
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,
>
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
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
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
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
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
ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
the tegra
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
Hi all,
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
ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
the tegra t
19 matches
Mail list logo
