[GIT,PULL,for,3.7] pull request on dt2 branch from arch-pxa

Submitted by Haojian Zhuang on Sept. 21, 2012, 8:24 a.m.

Details

Message ID CAN1soZxC_KovdgENmsSQcUFkK2VgirkaKKSx1=RjLhULATw=+Q@mail.gmail.com
State New
Headers show

Pull-request

git://github.com/hzhuang1/linux.git dt2

Commit Message

Haojian Zhuang Sept. 21, 2012, 8:24 a.m.
Hi Olof & Arnd,

Please help to merge dt2 branch from arch-pxa git tree.

Regards
Haojian

The following changes since commit 5698bd757d55b1bb87edd1a9744ab09c142abfc2:

  Linux 3.6-rc6 (2012-09-16 14:58:51 -0700)

are available in the git repository at:

  git://github.com/hzhuang1/linux.git dt2

for you to fetch changes up to 37586e0b9cadd1072196c3cca8ea8559b91b1605:

  ARM: dt: mmp-dma: add binding file (2012-09-21 15:51:26 +0800)

----------------------------------------------------------------
Zhangfei Gao (1):
      ARM: dt: mmp-dma: add binding file

 Documentation/devicetree/bindings/dma/mmp-dma.txt |   74 +++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/dma/mmp-dma.txt

Comments

Olof Johansson Sept. 22, 2012, 6:08 a.m.
On Fri, Sep 21, 2012 at 04:24:58PM +0800, Haojian Zhuang wrote:
> Hi Olof & Arnd,
> 
> Please help to merge dt2 branch from arch-pxa git tree.
> 
> Regards
> Haojian
> 
> The following changes since commit 5698bd757d55b1bb87edd1a9744ab09c142abfc2:
> 
>   Linux 3.6-rc6 (2012-09-16 14:58:51 -0700)
> 
> are available in the git repository at:
> 
>   git://github.com/hzhuang1/linux.git dt2
> 
> for you to fetch changes up to 37586e0b9cadd1072196c3cca8ea8559b91b1605:
> 
>   ARM: dt: mmp-dma: add binding file (2012-09-21 15:51:26 +0800)
> 
> ----------------------------------------------------------------
> Zhangfei Gao (1):
>       ARM: dt: mmp-dma: add binding file

What happened to the rest of this series? It makes more sense to merge the
driver using the binding at the same time as the binding itself, so let's hold
off until the driver is reviewed and ready to go in too (or, if you merge that
through a different path, the binding could/should go with it there).


-Olof
Haojian Zhuang Sept. 26, 2012, 6:04 a.m.
On Sat, Sep 22, 2012 at 2:08 PM, Olof Johansson <olof@lixom.net> wrote:
> On Fri, Sep 21, 2012 at 04:24:58PM +0800, Haojian Zhuang wrote:
>> Hi Olof & Arnd,
>>
>> Please help to merge dt2 branch from arch-pxa git tree.
>>
>> Regards
>> Haojian
>>
>> The following changes since commit 5698bd757d55b1bb87edd1a9744ab09c142abfc2:
>>
>>   Linux 3.6-rc6 (2012-09-16 14:58:51 -0700)
>>
>> are available in the git repository at:
>>
>>   git://github.com/hzhuang1/linux.git dt2
>>
>> for you to fetch changes up to 37586e0b9cadd1072196c3cca8ea8559b91b1605:
>>
>>   ARM: dt: mmp-dma: add binding file (2012-09-21 15:51:26 +0800)
>>
>> ----------------------------------------------------------------
>> Zhangfei Gao (1):
>>       ARM: dt: mmp-dma: add binding file
>
> What happened to the rest of this series? It makes more sense to merge the
> driver using the binding at the same time as the binding itself, so let's hold
> off until the driver is reviewed and ready to go in too (or, if you merge that
> through a different path, the binding could/should go with it there).
>
>
> -Olof

Vinod merges the rest of the patch series into his dma tree except for this one.
I have to merge this one.

http://www.spinics.net/lists/arm-kernel/msg195141.html

Would you like to merge it into arm-soc tree?

Regards
Haojian
Olof Johansson Sept. 29, 2012, 6:44 p.m.
On Wed, Sep 26, 2012 at 02:04:36PM +0800, Haojian Zhuang wrote:
> On Sat, Sep 22, 2012 at 2:08 PM, Olof Johansson <olof@lixom.net> wrote:
> > On Fri, Sep 21, 2012 at 04:24:58PM +0800, Haojian Zhuang wrote:
> >> Hi Olof & Arnd,
> >>
> >> Please help to merge dt2 branch from arch-pxa git tree.
> >>
> >> Regards
> >> Haojian
> >>
> >> The following changes since commit 5698bd757d55b1bb87edd1a9744ab09c142abfc2:
> >>
> >>   Linux 3.6-rc6 (2012-09-16 14:58:51 -0700)
> >>
> >> are available in the git repository at:
> >>
> >>   git://github.com/hzhuang1/linux.git dt2
> >>
> >> for you to fetch changes up to 37586e0b9cadd1072196c3cca8ea8559b91b1605:
> >>
> >>   ARM: dt: mmp-dma: add binding file (2012-09-21 15:51:26 +0800)
> >>
> >> ----------------------------------------------------------------
> >> Zhangfei Gao (1):
> >>       ARM: dt: mmp-dma: add binding file
> >
> > What happened to the rest of this series? It makes more sense to merge the
> > driver using the binding at the same time as the binding itself, so let's hold
> > off until the driver is reviewed and ready to go in too (or, if you merge that
> > through a different path, the binding could/should go with it there).
> >
> >
> > -Olof
> 
> Vinod merges the rest of the patch series into his dma tree except for this one.
> I have to merge this one.
> 
> http://www.spinics.net/lists/arm-kernel/msg195141.html
> 
> Would you like to merge it into arm-soc tree?
> 

Applied to next/dt. Thanks!


-Olof