From patchwork Tue Apr 11 03:59:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13207018 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 E0DBCC76196 for ; Tue, 11 Apr 2023 03:59:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 28EB510E475; Tue, 11 Apr 2023 03:59:20 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 08BCE10E475 for ; Tue, 11 Apr 2023 03:59:17 +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 4PwXCL52fyz4xGq; Tue, 11 Apr 2023 13:59:10 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1681185551; bh=PSnq4tRQyq3JySukDjQbFoPm5z5kwIh+DBQ57ICUdtg=; h=Date:From:To:Cc:Subject:From; b=nPcZq8NBvd4BfeoqNtwk4KK8wEqzBEsJNfxjTcixOIzvivA5EmOP/0ujAdqHuz6cC QZAaTd/MHXZ/+c+aOgqylWtvlNvxwl90uY0kpY/3nlA+8Ha2Hs/BuUZ3KkJcdUSJF9 kGPhnblfzQRyPNCfmR0D7ZDPXsjzn6ou0xoDJF4CjDeZcPCHnt6ZB4TRRHIdnFCTDB 6QBfE7fsE/S1pfuPLbQiK2h/3dfBE2+BQyh9WIj5rJpKSJ6rdvvf/uA1+pNzo8useX zFTJoNnUYIr7nWflpwVOlZ5ncM/D2ZiRCfpXFqO8p21wXXpucieOzZQLl3eFcJ1T0X knKwZ8wQ6Q/LQ== Date: Tue, 11 Apr 2023 13:59:09 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Dave Airlie Subject: linux-next: manual merge of the tip tree with the drm tree Message-ID: <20230411135909.140d2560@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: , Cc: Linux Kernel Mailing List , DRI , Linux Next Mailing List , Andrzej Hajda , Vinay Belgaumkar , Umesh Nerlige Ramappa Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/gpu/drm/i915/gt/intel_rc6.c between commit: 3735040978a4 ("drm/i915/mtl: Synchronize i915/BIOS on C6 enabling") from the drm tree and commit: f7faedffa92c ("drm/i915/gt: use __xchg instead of internal helper") from the tip 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/i915/gt/intel_rc6.c index 8f3cd68d14f8,3d6109f1d05c..000000000000 --- a/drivers/gpu/drm/i915/gt/intel_rc6.c