From patchwork Thu Apr 16 01:25:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11492195 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 A53C481 for ; Thu, 16 Apr 2020 01:25:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 82B832076D for ; Thu, 16 Apr 2020 01:25:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="adEKi4mP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82B832076D 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=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 237816EAC2; Thu, 16 Apr 2020 01:25:31 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 85139 seconds by postgrey-1.36 at gabe; Thu, 16 Apr 2020 01:25:29 UTC Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 26C806E05D; Thu, 16 Apr 2020 01:25:28 +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 492hNz2ng9z9sR4; Thu, 16 Apr 2020 11:25:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1587000326; bh=x3lpdVUepnNgZQf7tZXXTh4P8pqMEPhXHfvV9QGBu1U=; h=Date:From:To:Cc:Subject:From; b=adEKi4mPSl/DAn2aUbOCZMdSE75cWBVRHEAU51KWKVgEG1SUS72HmOhiZC3QTreNL qmrRl+1bzt/zWkI8XD9bawy4JMtDEl0t5FaQhRszwGe2oljGGJuX38qLJJpa8uY00f H6lv8aUrKkKCmEFUIigNqU3V9shsiPxFoKKbWMD+/B0aYtAdsTPK7taD0gcGEnHtLH i9GTQAPJzzoiLSJNxNCv1Z+wQpKNGpvFalFbQqQNl2LlcZkJFj9LChegocfuaFalDo 81g40isLTiPIu/idFHaXeZv4Dk3xmPacjtt3/+s2GrTWkbOP8Aa3yDmk1MBcgqb1KA xHRKx9ZKXBizw== Date: Thu, 16 Apr 2020 11:25:19 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Message-ID: <20200416112519.7a1fdd8b@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joe Perches , Linus Torvalds , Linux Next Mailing List , Sam Ravnborg , Linux Kernel Mailing List Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: MAINTAINERS between commits: 4400b7d68f6e ("MAINTAINERS: sort entries by entry name") 3b50142d8528 ("MAINTAINERS: sort field names for all entries") from Linus' tree and commits: 5304058b1526 ("dt-bindings: display: convert arm,versatile-tft-panel to DT Schema") c1eb28405d3a ("dt-bindings: display: convert boe,himax8279d to DT Schema") 1aa3bf853cb4 ("dt-bindings: display: convert raydium,rm67191 to DT Schema") 8b9e7ace123d ("dt-bindings: display: convert olimex,lcd-olinuxino to DT Schema") from the drm-misc 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 MAINTAINERS index a7f3c96eb61e,ccd0ccfce4eb..000000000000 --- a/MAINTAINERS