From patchwork Tue May 21 00:51:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10952743 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8461F14B6 for ; Tue, 21 May 2019 00:52:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75F2828925 for ; Tue, 21 May 2019 00:52:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A1BC2892E; Tue, 21 May 2019 00:52:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1CFB628925 for ; Tue, 21 May 2019 00:52:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C4A0F891FA; Tue, 21 May 2019 00:51:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 45364 seconds by postgrey-1.36 at gabe; Tue, 21 May 2019 00:51:55 UTC Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1FC2C891FA; Tue, 21 May 2019 00:51:55 +0000 (UTC) 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 457HK35YNjz9s9T; Tue, 21 May 2019 10:51:51 +1000 (AEST) Date: Tue, 21 May 2019 10:51:51 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20190521105151.51ffa942@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1558399913; bh=mrT1NhYLTGm56w+283Q/Y/Bq4w6pdDYqc2RQ0JCklGU=; h=Date:From:To:Cc:Subject:From; b=bScaIWcjdzoAWs5HQl4+uIfctMX2CdWm3FrdE2Qa7dJ5FIWE+06ez5290MiCTI3EA b7KPVQADb9D3Ua5D7AmlB5Hy3+u3RfsgoKXaS/zBHO3vESkg2TAe3lZ6Cu7AAxW//S uWd9s5j7gg68GRInZLSm4zLWdvIRVX2eMGXG/TM4vLsAawzJWazyiMQZ+8pZTyd0UE PNd+rjTIcOZK9tGoTo1JbzPSdX+PvLHbuds72M+55X16EhiyuE4oj9ypK4r5U4lAQp VjYkKaBtuzGZ9xcO3kBXAxHjMGqfY2QceFEbhRbufDnqbPcDXI6+jhkMbGCHZVB4Oe wkmhByWTJeU6A== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Kernel Mailing List , Jyri Sarha , Marco Felsch , Linux Next Mailing List , Thierry Reding Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.txt between commit: 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema") from Linus' tree and commits: b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd") b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B") fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics") from the drm-misc tree. I fixed it up (I deleted the file and added the patch 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 --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 83ca4816a78b..749e3c3843d0 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -287,6 +287,8 @@ patternProperties: description: Everest Semiconductor Co. Ltd. "^everspin,.*": description: Everspin Technologies, Inc. + "^evervision,.*": + description: Evervision Electronics Co. Ltd. "^exar,.*": description: Exar Corporation "^excito,.*": @@ -851,6 +853,8 @@ patternProperties: description: Shenzhen Techstar Electronics Co., Ltd. "^terasic,.*": description: Terasic Inc. + "^tfc,.*": + description: Three Five Corp "^thine,.*": description: THine Electronics, Inc. "^ti,.*": @@ -925,6 +929,8 @@ patternProperties: description: Voipac Technologies s.r.o. "^vot,.*": description: Vision Optical Technology Co., Ltd. + "^vxt,.*" + description: VXT Ltd "^wd,.*": description: Western Digital Corp. "^wetek,.*":