From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A90C4C65BAF for ; Wed, 12 Dec 2018 16:32:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6EF1120849 for ; Wed, 12 Dec 2018 16:32:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EF1120849 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727909AbeLLQcR (ORCPT ); Wed, 12 Dec 2018 11:32:17 -0500 Received: from asavdk3.altibox.net ([109.247.116.14]:36451 "EHLO asavdk3.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726468AbeLLQcR (ORCPT ); Wed, 12 Dec 2018 11:32:17 -0500 Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by asavdk3.altibox.net (Postfix) with ESMTPS id EDA392003A; Wed, 12 Dec 2018 17:32:09 +0100 (CET) Date: Wed, 12 Dec 2018 17:32:08 +0100 From: Sam Ravnborg To: Christoph Hellwig Cc: Stephen Rothwell , David Miller , Linux Next Mailing List , Linux Kernel Mailing List , Rob Herring Subject: Re: linux-next: manual merge of the sparc-next tree with the dma-mapping tree Message-ID: <20181212163208.GA15535@ravnborg.org> References: <20181212093042.00fbf6be@canb.auug.org.au> <20181212074420.GB29137@lst.de> <20181212161146.GA7176@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181212161146.GA7176@lst.de> User-Agent: Mutt/1.5.21 (2010-09-15) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=dqr19Wo4 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=kj9zAlcOel0A:10 a=BIhM7jIV8n6q1u1aS5EA:9 a=CjuIK1q_8ugA:10 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 12, 2018 at 05:11:46PM +0100, Christoph Hellwig wrote: > On Wed, Dec 12, 2018 at 08:44:20AM +0100, Christoph Hellwig wrote: > > Dave, Sam: > > > > should I just apply a version of Rob's tree that takes the refactoring > > into account to the dma-mapping tree? That way we should get the right > > result independent of the merge order. > > E.g. something like the patch below: > > -- > >From 6ee3d6c39a0c8bc4b58fa601bb4370bdec785be7 Mon Sep 17 00:00:00 2001 > From: Christoph Hellwig > Date: Wed, 12 Dec 2018 17:09:58 +0100 > Subject: sparc: use DT node full_name in sparc_dma_alloc_resource > > The sparc tree already has this change for the pre-refactored code, > but pulling it into the dma-mapping tree like this should ease > the merge conflicts a bit. > > Signed-off-by: Christoph Hellwig > --- > arch/sparc/kernel/ioport.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c > index 51c128d80193..baa235652c27 100644 > --- a/arch/sparc/kernel/ioport.c > +++ b/arch/sparc/kernel/ioport.c > @@ -252,7 +252,7 @@ unsigned long sparc_dma_alloc_resource(struct device *dev, size_t len) > res = kzalloc(sizeof(*res), GFP_KERNEL); > if (!res) > return 0; > - res->name = dev->of_node->name; > + res->name = dev->of_node->full_name; > > if (allocate_resource(&_sparc_dvma, res, len, _sparc_dvma.start, > _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) { Whatever works best for everyone is fine for me, so ack from me. Sam