From patchwork Mon Nov 11 02:04:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13870169 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 85E85D12D5C for ; Mon, 11 Nov 2024 02:04:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD29110E112; Mon, 11 Nov 2024 02:04:56 +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="srGkHYti"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id C35AF10E112 for ; Mon, 11 Nov 2024 02:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1731290687; bh=Id+OPwn5s7JPd6OOP4WALIDODrSX11BclR0Trmi6WmI=; h=Date:From:To:Cc:Subject:From; b=srGkHYtim/0P4doqrpzQ0d2/vbc4jD4Nt8kCH7lad4lhCJCpg0Zu+4Ym6Sf1jcSBw TGxsBixH9npgeKrpkZ0Q/+coFl5FSufkVxvgnW1SNV4Ayse2aGj5kZC1J9eG2AoVRo VTkvJ4wYWAHE7p8ony6G5KjrJkgUSlTiWUy+/GuhkVMsrdhIqZwhlmsRagDhuA5XrY Pp6F3O2HWz7VXFnPo4wLbR92Ihsn7URF/oGUx5VS9Kwut9T+Ss3FSdG+yBtCs0AUhu D2b67qDTjoDpT43nXNKHAlIhe4Z/wajZ0UeZOGBDhSoCCE5D3x+VOAO25tRVKkGpVR 6KGf59RwXqe7Q== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4XmtCf3XBkz4w2H; Mon, 11 Nov 2024 13:04:46 +1100 (AEDT) Date: Mon, 11 Nov 2024 13:04:48 +1100 From: Stephen Rothwell To: Dave Airlie Cc: DRI , Balasubramani Vivekanandan , Linux Kernel Mailing List , Linux Next Mailing List , Lucas De Marchi , Matt Roper Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20241111130448.6b5a7655@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/xe/xe_gt_ccs_mode.c between commit: 7fd3fa006fa5 ("drm/xe: Set mask bits for CCS_MODE register") from Linus' tree and commit: a851edc457ed ("drm/xe/ccs_mode: Convert register access to use xe_mmio") from the drm 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 drivers/gpu/drm/xe/xe_gt_ccs_mode.c index ffcbd05671fc,9360ac4de489..000000000000 --- a/drivers/gpu/drm/xe/xe_gt_ccs_mode.c