mbox

[S/master-next,GIT,PULL] Highbank LPAE and Midway fixes

Message ID 20130830153008.GA3277@luxor.wired.org
State New
Headers show

Pull-request

git://kernel.ubuntu.com/ppisati/ubuntu-saucy.git master-next-lpae

Message

Paolo Pisati Aug. 30, 2013, 3:30 p.m. UTC
The following changes since commit d215ca4ea32fb75f2bb05ac79e4534f9597c30c1:

  UBUNTU: [Config] CONFIG_ARPD=y (2013-08-28 09:31:45 -0600)

are available in the git repository at:

  git://kernel.ubuntu.com/ppisati/ubuntu-saucy.git master-next-lpae

for you to fetch changes up to 18488b3b14d9fcb41e4abd4bc793c787044396dd:

  ARM: xen: only set pm function ptrs for Xen guests (2013-08-30 11:06:46 +0200)

----------------------------------------------------------------
Andre Przywara (2):
      DMA: fix AMBA PL08x compilation issue with 64bit DMA address type
      DMA: fix printk warning in AMBA PL08x DMA driver

Rob Herring (9):
      ARM: use phys_addr_t for DMA zone sizes
      ARM: highbank: enable DMA zone for LPAE
      ARM: highbank: select ARCH_HAS_HOLES_MEMORYMODEL
      ARM: highbank: select required errata work-arounds
      ARM: highbank: select ARCH_DMA_ADDR_T_64BIT for LPAE
      ARM: move outer_cache declaration out of ifdef
      ARM: highbank: avoid L2 cache smc calls when PL310 is not present
      ARM: highbank: clean-up some unused includes
      ARM: xen: only set pm function ptrs for Xen guests

 arch/arm/include/asm/mach/arch.h  |  2 +-
 arch/arm/include/asm/outercache.h |  4 ++--
 arch/arm/mach-highbank/Kconfig    |  6 ++++++
 arch/arm/mach-highbank/highbank.c | 20 +++++++++-----------
 arch/arm/mm/init.c                |  2 +-
 arch/arm/xen/enlighten.c          |  5 ++++-
 drivers/dma/amba-pl08x.c          | 23 ++++++++++++++---------
 7 files changed, 37 insertions(+), 25 deletions(-)

The original pull request can be find here:

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

and the patchset is part of the arm-soc git tree slated for 3.12 inclusion:

https://kernel.googlesource.com/pub/scm/linux/kernel/git/arm/arm-soc/+/3616257f30316cccb0d92eed83d858f5b49e57ac

while the xen patch is part of the xen git tree:

https://git.kernel.org/cgit/linux/kernel/git/sstabellini/xen.git/commit/?h=stable/for-linus-3.11

Comments

Andy Whitcroft Sept. 2, 2013, 11:38 a.m. UTC | #1
On Fri, Aug 30, 2013 at 05:30:08PM +0200, Paolo Pisati wrote:
> The following changes since commit d215ca4ea32fb75f2bb05ac79e4534f9597c30c1:
> 
>   UBUNTU: [Config] CONFIG_ARPD=y (2013-08-28 09:31:45 -0600)
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/ppisati/ubuntu-saucy.git master-next-lpae
> 
> for you to fetch changes up to 18488b3b14d9fcb41e4abd4bc793c787044396dd:
> 
>   ARM: xen: only set pm function ptrs for Xen guests (2013-08-30 11:06:46 +0200)

Will handle this.

-apw
Andy Whitcroft Sept. 3, 2013, 8:05 a.m. UTC | #2
Applied to Saucy.

-apw