From patchwork Mon Oct 17 22:05:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 3757 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1664691wrs; Mon, 17 Oct 2022 15:13:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6nRk1vlf5EZQl5uqpQi3vqFN6GNMXEMHfULFoInQXWBWwpIVVSsIoGfk3fcjFdeJcQptqg X-Received: by 2002:a17:902:a5c9:b0:182:3c47:6e86 with SMTP id t9-20020a170902a5c900b001823c476e86mr13986410plq.152.1666044825065; Mon, 17 Oct 2022 15:13:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666044825; cv=none; d=google.com; s=arc-20160816; b=dEwZZTnzmz13NlYR7Tfpkd7o7BXPMsyfAd0G5Eubydrwvxs2469yHlKA7/9hSqTGZ9 XN0AUtkwmBw6MeQRkAgb8FeAj70FzYB22+nVNJ7ZUOkvTC8ZdTwN0rGovBhxAn+RxRYr //UhxgT+qeuumFqP57mQERnOMd0FZthu8VGvt6NGFw7K/9iztRXgnhVWRhQnETQqUJOP 7uu9mhqB6IUO/INE7Uj8VAE+5xPwz0yfCI8zidQucSNzjgsLO1xtUuUNO8WvpBFPWK+m IW+NCKFHDiO6iYm0eYs9WoTOCVdF8/V49Dn7JWTt0KSeMyo8+TE/hdXBqM6Lcc2PzS07 PzQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=EPhBXfS+bFT0iossjSTvhCbbZ9sAlv5VbZmlGq7HH/g=; b=DSKDS8HXIf1hquzKqt3xAd0q7PaagI03bKoMpodRAke8voeDPFdEqtPzQooVmX4c9o ltq02DjBlYScRJH8kTRfsgd7Rn41KKG/a25Cy+Ok/RIWrJO3C+JZklTN68s8w0rVcXT/ i7cH5xeChkCiUEW7O4595wsjGDef86l1wYpSiRjYV+fgeBMUXva/qCN/pPs5rMzdoCvB UIFzdGvqZ0hOEyK1H17oOfGDqkjWwL345OUUGwC0jkE351C9Z84NTj3LcrVVsKQz4Dzt s0ulDIT0miaL+IL0msJjgLiCkz1H9cu+MiY45vJtw6wCyE8TDxnitjhRL63EeP1pHpF7 QZ9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BKmqcFda; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j30-20020a63231e000000b0043c1481a835si13761602pgj.267.2022.10.17.15.13.27; Mon, 17 Oct 2022 15:13:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BKmqcFda; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229982AbiJQWFy (ORCPT + 99 others); Mon, 17 Oct 2022 18:05:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229976AbiJQWFw (ORCPT ); Mon, 17 Oct 2022 18:05:52 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA60D7269C; Mon, 17 Oct 2022 15:05:49 -0700 (PDT) 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 4MrrfH4Jy9z4xGm; Tue, 18 Oct 2022 09:05:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1666044344; bh=EPhBXfS+bFT0iossjSTvhCbbZ9sAlv5VbZmlGq7HH/g=; h=Date:From:To:Cc:Subject:From; b=BKmqcFdarvAn9alD/3LlGWl4uOfgj23jEJcwWNU8Y0oPdWVwspPgCC9NffDevm9LJ k6ebiHR8Gse0INnL5tSpQUj/MbYxR/Eg7MMIJaobB6jt2zwxuu5yzUuviuA43cUZWr QQr8wNOr6bDbsMXF4Exmhzmfp8aDuK3K0N4loFJtRYECLRzOs/mKPbQ33WaIe0HPnN i6VbTv+WST4CO0wKHKERm0z6I3AWAomCUSuBK+I13OOaH3ovUFl7T8gcUITjOgIRUJ dcEo11ZjXfOza/FaHInY3Ac8srWY10lSUvKw2hbvTO2zDscBHHNnVSgOI1rQruTGxh B3W3nGnx1LF/w== Date: Tue, 18 Oct 2022 09:05:41 +1100 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Cc: Andi Shyti , Andrzej Hajda , Linux Kernel Mailing List , Linux Next Mailing List , Matt Roper Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20221018090541.74bff3e2@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746974618227086539?= X-GMAIL-MSGID: =?utf-8?q?1746974618227086539?= Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_driver.c between commit: 1c66a12ab431 ("drm/i915: Handle each GT on init/release and suspend/resume") from Linus' tree and commit: 3703060d17b0 ("drm/i915/display: remove drm_device aliases") 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/i915_driver.c index c459eb362c47,e7b2ebc6b88d..000000000000 --- a/drivers/gpu/drm/i915/i915_driver.c