From patchwork Tue Jun 7 23:59:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12872588 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 10F21C433EF for ; Tue, 7 Jun 2022 23:59:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6040110E0F4; Tue, 7 Jun 2022 23:59:40 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id A89ED10E0F4; Tue, 7 Jun 2022 23:59:38 +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 4LHnQc41TJz4xD9; Wed, 8 Jun 2022 09:59:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1654646377; bh=qMAL1jVBkcRNa7CuXLedIvQH7GZUdyMOYdDM3XQ6o8E=; h=Date:From:To:Cc:Subject:From; b=V8jjSVrVKRxsBz2Ar5yvxoDzEXe2NEZ4RtEsehU2OBVJHycdwDsU5AQMkLfYEliTL 4MaIQ040AVnj3hh4MD7IwLcE05vQMYZkImX/a8FY0XwhgbWBFEYe5sDOQIBnbUUaUJ cmZHyBdtlAF5CNra4tsXUghBO7TCxg3B4id3nVZNZGPzC4d06etFVfZqKfDDD5iLf5 BcxSa0T+bbadM+En9EXf+KsUUqJjGsqY9FjkWKSRUNhLFCpdLQqfzqXd7f19hyhaUi yrA0SubKFMDcoR1Sj/4YbZi4MUif0wHCCOLe2f1m/9ILqgz4MfJwbcjUxptv2UfOrb G/wkwTYPwDSHw== Date: Wed, 8 Jun 2022 09:59:35 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20220608095935.2265208c@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: Tvrtko Ursulin , Anshuman Gupta , Intel Graphics , Linux Kernel Mailing List , DRI , Ashutosh Dixit , Linux Next Mailing List Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/gt/intel_rps.c between commit: 56758cc45955 ("drm/i915/rps: Centralize computation of freq caps") from Linus' tree and commit: ee421bb4cb95 ("drm/i915/pcode: Extend pcode functions for multiple gt's") from the drm-intel 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_rps.c index 3476a11f294c,ce61ceb07114..000000000000 --- a/drivers/gpu/drm/i915/gt/intel_rps.c