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=-2.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=unavailable 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 B8FA0C43381 for ; Fri, 22 Feb 2019 12:53:12 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 333C22070D for ; Fri, 22 Feb 2019 12:53:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 333C22070D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 445WTx4XWHzDqWt for ; Fri, 22 Feb 2019 23:53:09 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lst.de (client-ip=213.95.11.211; helo=newverein.lst.de; envelope-from=hch@lst.de; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=lst.de Received: from newverein.lst.de (verein.lst.de [213.95.11.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 445WQ75mHnzDqWM for ; Fri, 22 Feb 2019 23:49:50 +1100 (AEDT) Received: by newverein.lst.de (Postfix, from userid 2407) id BB8E768CEC; Fri, 22 Feb 2019 13:49:46 +0100 (CET) Date: Fri, 22 Feb 2019 13:49:46 +0100 From: Christoph Hellwig To: Michael Ellerman Subject: Re: linux-next: manual merge of the powerpc tree with the dma-mapping tree Message-ID: <20190222124946.GA29125@lst.de> References: <20190222091728.6d3d9877@canb.auug.org.au> <87ef80pjwy.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87ef80pjwy.fsf@concordia.ellerman.id.au> User-Agent: Mutt/1.5.17 (2007-11-01) X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , Linux Kernel Mailing List , Linux Next Mailing List , PowerPC , Christoph Hellwig Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Fri, Feb 22, 2019 at 02:43:41PM +1100, Michael Ellerman wrote: > Stephen Rothwell writes: > > > Hi all, > > > > Today's linux-next merge of the powerpc tree got a conflict in: > > > > arch/powerpc/kernel/dma-swiotlb.c > > > > between commit: > > > > cfced786969c ("dma-mapping: remove the default map_resource implementation") > > > > from the dma-mapping tree and commit: > > > > 68005b67d15a ("powerpc/dma: use the generic direct mapping bypass") > > > > from the powerpc tree. > > > > I fixed it up (I just used the latter) and can carry the fix as > > necessary. This is now fixed as far as linux-next is concerned, but any > > non trivial conflicts should be mentioned to your upstream maintainer > > when your tree is submitted for merging. You may also want to consider > > cooperating with the maintainer of the conflicting tree to minimise any > > particularly complex conflicts. > > Thanks. > > Christoph, I've put the powerpc dma changes in a topic branch if you > want to merge it to reduce the conflicts. Up to you. Thanks. I think the conflicts are pretty harmless as we are mostly removing code entirely in the powerpc tree that the dma-mapping tree touches.