From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752641AbdGEU3e (ORCPT ); Wed, 5 Jul 2017 16:29:34 -0400 Received: from mout.gmx.net ([212.227.17.22]:52215 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752201AbdGEU3c (ORCPT ); Wed, 5 Jul 2017 16:29:32 -0400 Date: Wed, 5 Jul 2017 22:28:54 +0200 From: Helge Deller To: Linus Torvalds , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, James Bottomley , John David Anglin Cc: Thomas Bogendoerfer Subject: [GIT PULL] one parisc patch for v4.13-rc1 Message-ID: <20170705202854.GA14623@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:g7L7aR3BXGNFvmZ9znouqdCWI2iQ+j0aZbw9CPKA/58N8KPVGum 2k7l2nTjKf1aLpMA1ZBa9VFvsaed6aOVykO5xiVs1Tx1Fyoyi83evFl3W7MmA0yc0JSeqBG n0cGM0JXoB7Z1wRkHHegsB45P8SftczFRL7iWcXmIaqX3S5tv2gzAb+ULXJ5CMh5jQiuDXf fzoBuZmSFEgxNvJZEffCA== X-UI-Out-Filterresults: notjunk:1;V01:K0:XFcOvF4RDd4=:GVl1fJ1++MUztBb1maCpMj 1HW49fcHx/XN0+jA0SmYfmX2zM2VQ8BRGQ0ceBmMBT1Y9alj+E5BMMye9BSO3c8kj/2U4aEKL o1zKaVG8Eu/jriuJ0j4WBrf2nUdzanGvAs7BA/2YMqQpodawK/TMHc1yZ6J1mkNdYF7pr27gi 9hN/Ydsx4AJHSR8OKmWnP3oXfVNkOutOYT4rkq6M/DIhSo13dmr7+4n0+DfTJ42NiCK4PQtum Y5HhzMDFwWo3w68eymVhyFLDAzKkdVS0i6fAFLokg2Tw0fc3Y7mjp+k5U+CKkeEJn/AEvpJV8 ZPGklfGR9HxfOsoGPPiCvpKHUHKHXbCNNgQKwkUWdYviGMbjsHl6dr3PB1sJAQHlty4L3tQ6j E74IDCe28Mf6pnQT6hnl5SkcHIuhLwBWFfelEn3PNM0zXdn/X22wC9a9ZGgKsJ12k83Y/BEF9 ymr9fmJQXwJ4bId9cajgnyQSQ/ooxMLz5f1+TNdacYrchVaPOHW2TCnLe0nwPgH0SoUxlEs+j 3FyHsQtungtu2uhzZMzFXlw8RsawYTWr7jZooB0qZVlRL0k722+OW7wdc8teMaWESP64jtlxz /fXor3Xy1AA0HjfL+cLUBV3wYUGILNEdEVmwhN61yJRdKUhmgM/CDpvnn5ngMvTxf0lt/MvwI 4DD/ORPTx4enWsVgc2xLwZzkkm/t4RRkuUEMO6dUSVCD1PbRxPKnNACwuX/kQFIAVDqxLe5Rr hICgvYbGeD6wBKg4yNn/BrEGEDergMRFgyi+9YMFQqG3vWLJrJ3YyzKEZcA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Christoph Hellwig provided one patch for the parisc architecture to drop the DMA_ERROR_CODE define from the parisc architecture. He asked me to test it and send it to you ASAP so that he can send the pull request for the dma-mapping tree. That said, can you please pull it from git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-4.13-1 before you pull Christophs dma-mapping tree ? Changes: - Drop DMA_ERROR_CODE and convert to ->mapping_error (by Christoph Hellwig) Thanks, Helge ---------------------------------------------------------------- Christoph Hellwig (1): parisc: ->mapping_error arch/parisc/include/asm/dma-mapping.h | 2 -- drivers/parisc/ccio-dma.c | 10 +++++++++- drivers/parisc/sba_iommu.c | 10 +++++++++- 3 files changed, 18 insertions(+), 4 deletions(-)