From patchwork Wed Nov 25 01:33:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11930051 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 52AD9C2D0E4 for ; Wed, 25 Nov 2020 01:35:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 CBB72206D5 for ; Wed, 25 Nov 2020 01:35:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TdSI85gH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="MJIa4GYP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBB72206D5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=cO8jrciu0sHN5NcE04gVqH7N7rWiDKbMfnM9hRFFgs8=; b=TdS I85gHzT0hjXKC/E/Obvn8ILI8sArxGGo5Bh05/66cYh3FqonKrznNDkibeNLv85hiiwxtccGuXb1B stdCXyzFyGMp2Z4kT/GekLvlg1qn2FbmRWU2oRhPzo0MVSs4psOMZoiZwg3bXPtc3iwkQ8aun+wck /TwmNCPN+Wbylkqs1h4TsTOj9P5CAniNugVq1QM3jBZRfpKIi1I4HgJZjMRYQzSGvNOusE5JauXnk LSrQ0d97tzniOZDbwPrWFm5hOCfMuuTfT61xFXqRnElZ6pFy/jXF0VJQ0IbAyI0cr803qxbxslhBO CES8T0ciqPUKn1E2SVLTnNIYz7U2HaQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khjhA-0007iK-41; Wed, 25 Nov 2020 01:34:08 +0000 Received: from ozlabs.org ([203.11.71.1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khjh6-0007hC-JK for linux-arm-kernel@lists.infradead.org; Wed, 25 Nov 2020 01:34:05 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Cgk1t0pGQz9sRK; Wed, 25 Nov 2020 12:33:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1606268036; bh=AWtRg8TumvQihE/WyzTXYZtvD9YcdKbFYVNmhBEpn1w=; h=Date:From:To:Cc:Subject:From; b=MJIa4GYPiLQAHPU5M07/XpHw9XtfylubXLGaRRZ5NDnNyA2VflfQ3KCfi48KIxMH9 R7vgJTFGgYISqaWioUx1SUi7zqDO/+HA+TgNG0qKzDvSBicVKK7b4tzGUxRODTdaDw gfFvUesBcWGUrXyPh5wW5RVfXD+x03wAcA52t+oLPM9hG24TMAbZ1BZ3LRQrymndUG Akn9eNgghwamsUOC9Z3Uzr4SiHAyYXjlH52W4CXj+6sF8f7BEK/hofXT1/5eXQRouN G4hBZfRgY2akixN9xbLP3mbCID+mGBkaGaxpGrMmTwlSPP3d8hFS7osX4K4iSV0uQC TvH5Qm3W3Q1eA== Date: Wed, 25 Nov 2020 12:33:51 +1100 From: Stephen Rothwell To: Doug Ledford , Jason Gunthorpe , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the rdma tree with the arm-soc tree Message-ID: <20201125123351.16954b02@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201124_203404_873732_43737039 X-CRM114-Status: GOOD ( 18.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Kernel Mailing List , Jason Gunthorpe , Linux Next Mailing List , Maxime Ripard , Jason Gunthorpe , Christoph Hellwig Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the rdma tree got a conflict in: include/linux/dma-mapping.h between commit: 16fee29b0735 ("dma-mapping: remove the dma_direct_set_offset export") from the arm-soc tree and commit: 172292be01db ("dma-mapping: remove dma_virt_ops") from the rdma tree. I fixed it up (see below) 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. diff --cc include/linux/dma-mapping.h index 199d85285246,2aaed35b556d..000000000000 --- a/include/linux/dma-mapping.h