From patchwork Wed Sep 4 10:44:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11129869 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E153B13B1 for ; Wed, 4 Sep 2019 10:44:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B1BDD22DBF for ; Wed, 4 Sep 2019 10:44:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Xhlh7OHk"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="PZrcsQdv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1BDD22DBF 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=Bd2X2oXN9Gcr3zzEiIyMQ/NvQXsmKcgoxXLag7TWPUA=; b=Xhl h7OHkMXHPCCq6nDGZ59r2mv2ZOP3RuFH20qjx17Qhfb4fbp3BvpReIaSgB0YiWhVCjk98qQhr3UfB hz4wxeyXqANKOLRzzhUOVrQUQWuZV09MaGLmXFLk2etVwFZxIEA6kkUKXElxSMZVs43P4PbEq5KOU BhtDRUe6G5KD9oFM8abjB8CCVSPI9HxyGrOzyru8iLrFiNWnm5hc9wArZxU1ndoxtdLeNOzdDZxxQ zL8MQDMEEt8+KMrWcoA6YS4PVZk8gGUULLNrV+JosJK0lwckD4WPgP5rCC3HcK7IJSOgPrt7B7ltY vpb6ZO6kybvMZmAV0DlKNWA5EfJ7w7A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i5SmJ-0002Jl-Ns; Wed, 04 Sep 2019 10:44:43 +0000 Received: from bilbo.ozlabs.org ([203.11.71.1] helo=ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i5SmG-0002IB-Dy for linux-arm-kernel@lists.infradead.org; Wed, 04 Sep 2019 10:44:41 +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 46NgRy2ffgz9sDQ; Wed, 4 Sep 2019 20:44:30 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1567593871; bh=q51v6jMKfuMMsSNQkaFTfC+YDlmgKQBdULryscFJ038=; h=Date:From:To:Cc:Subject:From; b=PZrcsQdvrc9rYmb5r9Bk1LoYEA8tbrMSzxY1x3Q9nasSr9ar1TiKhiVvD29wyBWGp Z/49E+ypr6HdyobnOBw9FanboRg9CnYE3hiNL5eX31EA2fpbG7AncidoL44kwne9aT J4JrFOt1fAjd1xRajN9WL4t8gkHkw5SLPG5vHV/kKmrqVsLyT127l8Y1FdyuUJFQcC l1L/qX6Vkr9YyV4xsMYNGJ7DZq5h4UN4rVtNpyx51SE2rHCd3YGz6EthJLB2lCE3V0 Jm/06Y5dvhBqDpALoeE8J9KPvbJfelPKjjizntlV5En4HHz6KBXKUcxGkL0OA70eZs Hv0foYU83L7qw== Date: Wed, 4 Sep 2019 20:44:27 +1000 From: Stephen Rothwell To: Vinod Koul , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the slave-dma tree with the arm-soc tree Message-ID: <20190904204427.1e1a064f@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190904_034440_660167_9D0E243C X-CRM114-Status: UNSURE ( 7.05 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 Next Mailing List , Randy Dunlap , Linux Kernel Mailing List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the slave-dma tree got a conflict in: drivers/dma/iop-adma.c between commit: 00c9755524fb ("dmaengine: iop-adma: use correct printk format strings") from the arm-soc tree and commit: d17d9ea95727 ("dmaengine: iop-adma.c: fix printk format warning") from the slave-dma 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 drivers/dma/iop-adma.c index 03f4a588cf7f,003b753e4604..000000000000 --- a/drivers/dma/iop-adma.c