From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756145AbbDUU7f (ORCPT ); Tue, 21 Apr 2015 16:59:35 -0400 Received: from mout.gmx.net ([212.227.15.15]:50261 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752929AbbDUU7e (ORCPT ); Tue, 21 Apr 2015 16:59:34 -0400 Date: Tue, 21 Apr 2015 22:59:22 +0200 From: Helge Deller To: Linus Torvalds , linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, James Bottomley , John David Anglin Subject: [GIT PULL] parisc fixes for v4.1 Message-ID: <20150421205922.GA16749@p100.box> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Provags-ID: V03:K0:L7bYMrRG56Bq6dLEHX6qkP7FNrUudviEeN0qy2NblHxUvzc2g1K 05snjXsr4HPkJ+/rJgfDDKl0SDV6/C4eYvjJ+9tE0pIGgn/i5bkkDdB5a5MoqWqSVVpgkZY E95mxaFJklyxQwh0Pb+nS0j1+WwPSpZ9XB5JAgQUNLR3Q9mECUUYHT8PBmLRjTA0JXt84Fz gXvsu9KKfbxst6RoTo5rg== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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