From patchwork Tue Oct 6 05:06:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11818059 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 7B6206CB for ; Tue, 6 Oct 2020 05:06:53 +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 3184B20870 for ; Tue, 6 Oct 2020 05:06:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ka83deGg"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="QP84RdHq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3184B20870 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=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=S6xUEZqX9EJI+fvJ64zo6UTiPNLZ2jj89/ZB99CBGEw=; b=Ka8 3deGgK/hwmbt/fuV16nBMTm4/tAOop6JUvmm52JRn/Bohh94DWuCfwWKHnl/yuKA1thOKjeD/o4rN +E1dd+Hzi+9vFuxeDZ3zsWfjmVZcHxbMwPwm6uosxO432TyqHUcqmT3WLHY/wLxj3lkRdmh6oy6Z9 yzlGW0QMzquyvViwpqdJ0nUpY0Zll4Ra5ENgZVu4CcUPOtwnBSn7J+5HEz8z35X8L4zd80ubBjafZ 7WItoxTyH4WaBDgwQgUsYGNY1RraMzPOwTnlmni1pmR0UdwTuiZhR3p94TZ8BCq4pEDINpWm5lOMY eG4hiiFlh6Xp35rb37OHSYhqTZsJWkg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kPfBQ-0001DY-V6; Tue, 06 Oct 2020 05:06:41 +0000 Received: from ozlabs.org ([203.11.71.1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kPfBO-0001CY-08 for linux-arm-kernel@lists.infradead.org; Tue, 06 Oct 2020 05:06:39 +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 4C55682Jcgz9sSG; Tue, 6 Oct 2020 16:06:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1601960793; bh=XDG4Ak+HG0NcqQMPWvutPzklTDbFLF3B5cH8nGgfJKs=; h=Date:From:To:Cc:Subject:From; b=QP84RdHqbOwpwL5tQzvPxVjtjY/rC7EsvSQ+ttzPJt+zSEp/lIr4JtRUvRkPZjYTn YYY3zttQJAKAd2yRv68zv5tPS0Z6vvi7FNGxkA+uRmJClebqhgKOtt0tr++P9c3Gh/ h6l8QtnyLfkNVuCrKIzS6lPIDn7tMpbYUin/tko3mlXuFEBWkTb+Xj+uTIgY4RVWeq tepzB+PAltPFWkAoy0EPY8ettDKKco6tUjDe50hdjPpHk3IXk3qbzks19AvTe2bk1A esw5jqmOQUKsi7adnNoVShaZelRKd7Gh6BHyPRxFymvdbDBUkXiX5I8AXgZZcqwzRq T3CjqY2Ppo4kA== Date: Tue, 6 Oct 2020 16:06:22 +1100 From: Stephen Rothwell To: Dmitry Torokhov , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the input tree with the arm-soc tree Message-ID: <20201006160622.601d8c28@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201006_010638_501124_61E59027 X-CRM114-Status: GOOD ( 17.03 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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: Michael Srba , Johan Jonker , Linux Next Mailing List , Heiko Stuebner , 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 input tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.yaml between commit: cb1cc137a2c1 ("dt-bindings: Add vendor prefix for Shenzhen Zkmagic Technology Co., Ltd.") from the arm-soc tree and commit: 8f445ffa851e ("dt-bindings: input/touchscreen: add bindings for zinitix") from the input 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/vendor-prefixes.yaml index 6242f1baa24c,bd7b2d404124..000000000000 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml