lkml.org 
[lkml]   [2015]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subject[GIT PULL] parisc fixes for v4.1
Hi Linus,

Please pull two patches for kernel v4.1 for the parisc architecture from

git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-4.1-1

The patch by Guenter Roeck fixes the build on parisc which got broken because
of commit f24ffde43237 (parisc: expose number of page table levels on Kconfig
level) and the patch from Matthew Wilcox converts our code to use the generic
scatterlist.h header file.

Thanks,
Helge

----------------------------------------------------------------
Guenter Roeck (1):
parisc: Replace PT_NLEVELS with CONFIG_PGTABLE_LEVELS

Matthew Wilcox (1):
parisc: Eliminate sg_virt_addr() and private scatterlist.h

arch/parisc/include/asm/Kbuild | 1 +
arch/parisc/include/asm/pgalloc.h | 6 +++---
arch/parisc/include/asm/scatterlist.h | 10 ----------
arch/parisc/kernel/pci-dma.c | 8 ++++----
drivers/parisc/ccio-dma.c | 6 +++---
drivers/parisc/iommu-helpers.h | 26 ++++++++++++++------------
drivers/parisc/sba_iommu.c | 7 +++----
7 files changed, 28 insertions(+), 36 deletions(-)
delete mode 100644 arch/parisc/include/asm/scatterlist.h


\
 
 \ /
  Last update: 2015-04-21 23:41    [W:0.054 / U:0.460 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site