From patchwork Mon Mar 25 23:29:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13603166 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id F2102C54E64 for ; Mon, 25 Mar 2024 23:29:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF8A810EB8E; Mon, 25 Mar 2024 23:29:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Q+Y/qNGA"; dkim-atps=neutral Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1634710EB8A; Mon, 25 Mar 2024 23:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1711409382; bh=EyfkhQ8hNpU8Py0szI+iEm/kcSgQWUtzoWYlXfx3z5M=; h=Date:From:To:Cc:Subject:From; b=Q+Y/qNGA4dgLEp4LQBlGdIoq7IB2iCmfzOflMloGXhWdVis97mhpmriHxO12EKH27 nKvmn6TuUgESumudC5rK64EKoiC0v3Nj9RvNHwqIjzs//WfE4h2EC5j1SKahuFrg3T IWBTh0tHnu2k9GfZOXagxDhR8Upfm6qZN7/ESdThnjVA1zHQMD+KcgoLdUhAZVnG/0 CZrA8FeyQ3GGvQ1kVwB8uu6Xg1iVGCaUlrZbGWblMsNI3MjI412sHITqGxZ501A5YE 3xFiSxYhij1y3DMC6skZlxC+48IQuWdsqeY8P3LY7mBD9Z6MNNmDi6GtgKG+NczwBk oxNnUDMmoEI+Q== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4V3Tfs3N8Bz4wcv; Tue, 26 Mar 2024 10:29:40 +1100 (AEDT) Date: Tue, 26 Mar 2024 10:29:40 +1100 From: Stephen Rothwell To: Daniel Vetter Cc: Intel Graphics , DRI , Andrew Davis , Linux Kernel Mailing List , Linux Next Mailing List , Maxime Ripard , Tony Lindgren Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20240326102940.3aae34c2@canb.auug.org.au> MIME-Version: 1.0 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: , 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: 35df039b26ac ("dt-bindings: gpu: Rename img,powervr to img,powervr-rogue") 796da8ca7e05 ("dt-bindings: gpu: Add PowerVR Series5 SGX GPUs") from Linus' tree and commit: 3f9ba0c01125 ("MAINTAINERS: Update drm-misc.git URL") 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 ae2121b7a176,13a69b4731c7..000000000000 --- a/MAINTAINERS