linux-mips
[Top] [All Lists]

Re: [PATCH 00/12] MIPS: ath79: AR724X PCI fixes and AR71XX PCI support

To: René Bolldorf <xsecute@googlemail.com>
Subject: Re: [PATCH 00/12] MIPS: ath79: AR724X PCI fixes and AR71XX PCI support
From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 24 Nov 2011 19:39:39 +0100
Cc: Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org, Imre Kaloz <kaloz@openwrt.org>
In-reply-to: <CAEWqx59_YvRfqKxhTYAxrCh=W+UV89V5ibMnBQpC+2i-Ed08Kg@mail.gmail.com>
References: <1322003670-8797-1-git-send-email-juhosg@openwrt.org> <CAEWqx5-HNNy-9BhYi=nnp3Q=vGQnq1hfH50env5W73ux2UiZXw@mail.gmail.com> <4ECCFE72.6090300@openwrt.org> <CAEWqx5_hgSH0FoWJPL0JDrVXGTWFCV0-FH9hXPMTxbG3A1pScQ@mail.gmail.com> <CAEWqx5_emEPp1HzK=SwOUJnJp5uFhco1asEQjuucdEV4rTQCdg@mail.gmail.com> <4ECD5B06.10204@openwrt.org> <CAEWqx5-deTQLVu=1S9XjKTeq+=O3OE-EXJsXugZAeKYFFzjo-w@mail.gmail.com> <4ECE5D8E.3030504@openwrt.org> <CAEWqx59_YvRfqKxhTYAxrCh=W+UV89V5ibMnBQpC+2i-Ed08Kg@mail.gmail.com>
Sender: linux-mips-bounce@linux-mips.org
2011.11.24. 16:54 keltezéssel, René Bolldorf írta:
> 2011/11/24 Gabor Juhos <juhosg@openwrt.org>:
>> Hi René,
>>
>>> Sorry Gabor for the following patch, but it seems your patchset was
>>> against a other tree?
>>
>> Both of my patch sets was based on the 'mips-for-linux-next' branch of Ralf's
>> 'upstream-sfr' tree:
>>
>> git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git
>>
>>> Because of the many failures I rebase'ed against 09521577ca7718b6c of the
>>> linus tree and written anything from scratch.
>>
>> That was waste of time. The ath79 platform got a pile of changes recently, 
>> and
>> those changes are not yet available in Linus' tree. If you were unsure about 
>> the
>> tree, you should have asked earlier.
>>
> 
> Alright. I don't play with all trees now.

Why if not indiscreet?

> I wait for the next merge.

If you mean Linus' tree, the new codes will not be merged into that before the
release of 3.2. You would have to wait for a few weeks probably.

-Gabor

<Prev in Thread] Current Thread [Next in Thread>