From patchwork Fri May 22 06:03:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11564717 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 EBDEB138A for ; Fri, 22 May 2020 06:03:31 +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 CA33120757 for ; Fri, 22 May 2020 06:03:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kq2AloLX"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="iglyGk6+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA33120757 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=vFNOOP9NlPy+JCpq8PMeGSA6uGK/T8Bjmj080/CFcys=; b=kq2 AloLXQoJs9E4XtZIy657CY2zLSpc9aDPssZR0AiLtGp2U0kY0fdpKuSRnaXtxEZ2yZgzmkKDsUjkJ U4bp/GevEhPJakOo3mtUFGsbAp0RT3ex8uqqq8Vp88t+d5iCX3u7O/cW5EskHXxAkc8euyK2wENGu R1OPs7M3utSlfq9fsOXtEj4OJB0aXeZIma++X/sARaehQzCizlAxFc4iC8HacgD5XSYkBMduXkMv8 lh7P4UQu52zGb1ujSXgig09m7UuXOVRCUDjYbjqkGp3Hw1PMPWse36trkQ+mws+u2uQYoHNecUld4 3yvg0ScrDtP+FnByWf1GMUPdvsdxWuA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jc0mA-0004aO-35; Fri, 22 May 2020 06:03:22 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jc0m7-0004ZX-7g for linux-arm-kernel@lists.infradead.org; Fri, 22 May 2020 06:03:20 +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 49Swry50w4z9sRW; Fri, 22 May 2020 16:03:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1590127396; bh=5xtALOvjXPu9+VIHx+DjHhfQ7lMYUJslakvA9myhjeE=; h=Date:From:To:Cc:Subject:From; b=iglyGk6+nnULH/rR4mLcFQxPazAC5WdSixdnMzqsGe89Y0ZA7Jj0rcIf4HZurYoGi X9+Qo+G+KF8Meg9LMc8CzHTFhEmx8xTWbZZyBWL9TIBhSk+z1dGbANcOWM72jP+Ja5 dKo1aOL9SIGg4HU5kvStKezaXbeSsLeYJpbksZ2OkJq5gSVcD8FhxBBuvz8shjSgD+ pxrwfyKTzwpyClCvt58Uk1EK/G6TsHiyBM//WT7h+0Bocc4MftL6SH+eyoPmYgF1yL 3ENIKCN4g3Beckqlsn/vMBl8vyHiN/bk/fvqEnvi6uIg0W+v/s0vi1XC86UglSUZfF th9yVpCkgnc4g== Date: Fri, 22 May 2020 16:03:13 +1000 From: Stephen Rothwell To: Rob Herring , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the devicetree tree with the arm-soc tree Message-ID: <20200522160313.09cb2b7e@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200521_230319_434453_ACA0401B X-CRM114-Status: UNSURE ( 7.44 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: Masahiro Yamada , Linux Next Mailing List , Linux Kernel Mailing List , Masami Hiramatsu 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 devicetree tree got a conflict in: Documentation/devicetree/bindings/arm/socionext/uniphier.yaml between commit: 82ab9b6705bd ("dt-bindings: arm: Add Akebi96 board support") from the arm-soc tree and commit: 9f60a65bc5e6 ("dt-bindings: Clean-up schema indentation formatting") from the devicetree 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 Documentation/devicetree/bindings/arm/socionext/uniphier.yaml index 10a7f0752281,113f93b9ae55..000000000000 --- a/Documentation/devicetree/bindings/arm/socionext/uniphier.yaml