mbox

[GIT,PULL] Allwinner fixes for 3.15

Message ID 20140508225352.GA13825@lukather
State New
Headers show

Pull-request

https://github.com/mripard/linux.git

Message

Maxime Ripard May 8, 2014, 10:53 p.m. UTC 
The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:

  Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)

are available in the git repository at:

  https://github.com/mripard/linux.git 

for you to fetch changes up to 84e108fc7b23310fb6d93a657e47181d64ab6e93:

  ARM: sunxi: Enable GMAC in sunxi_defconfig (2014-05-01 17:07:42 -0700)

----------------------------------------------------------------
Set of fixes for the Allwinner support for 3.15

Some minor things, the major thing being the enabling of the GMAC driver in
sunxi_defconfig that will un-break Olof's autobooters.

----------------------------------------------------------------
Emilio López (1):
      ARM: sun7i: fix PLL4 clock and add PLL8

Maxime Ripard (2):
      ARM: sun7i: Fix i2c4 base address
      ARM: sunxi: Enable GMAC in sunxi_defconfig

 arch/arm/boot/dts/sun7i-a20.dtsi | 14 +++++++++++---
 arch/arm/configs/sunxi_defconfig |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

Comments

Olof Johansson May 11, 2014, 3:24 a.m. UTC | #1 
On Thu, May 08, 2014 at 05:53:52PM -0500, Maxime Ripard wrote:
> The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:
> 
>   Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)
> 
> are available in the git repository at:
> 
>   https://github.com/mripard/linux.git 

This doesn't seem right.

However, I found a tag tags/sunxi-fixes-for-3.15 for
84e108fc7b23310fb6d93a657e47181d64ab6e93 in your repo, so I merged
that. Please check your scripts.


> for you to fetch changes up to 84e108fc7b23310fb6d93a657e47181d64ab6e93:
> 
>   ARM: sunxi: Enable GMAC in sunxi_defconfig (2014-05-01 17:07:42 -0700)

Merged.

-Olof
Maxime Ripard May 11, 2014, 4:38 a.m. UTC | #2 
On Sat, May 10, 2014 at 08:24:57PM -0700, Olof Johansson wrote:
> On Thu, May 08, 2014 at 05:53:52PM -0500, Maxime Ripard wrote:
> > The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:
> > 
> >   Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)
> > 
> > are available in the git repository at:
> > 
> >   https://github.com/mripard/linux.git 
> 
> This doesn't seem right.
> 
> However, I found a tag tags/sunxi-fixes-for-3.15 for
> 84e108fc7b23310fb6d93a657e47181d64ab6e93 in your repo, so I merged
> that. Please check your scripts.

Hmmm, odd indeed. I'll double-check to see where I might have screwed
this up. Sorry.

> > for you to fetch changes up to 84e108fc7b23310fb6d93a657e47181d64ab6e93:
> > 
> >   ARM: sunxi: Enable GMAC in sunxi_defconfig (2014-05-01 17:07:42 -0700)
> 
> Merged.

Thanks!
Maxime