From patchwork Tue May 30 01:59:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 100498 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1884030vqr; Mon, 29 May 2023 19:12:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4apf7MV+PTIN6VtoKBpocubQCZTXQOinNh/RD9SFZ5OPf8PwdiYvCAuOBe6m70JsxeN8tm X-Received: by 2002:a17:90a:ac10:b0:253:49d7:ce19 with SMTP id o16-20020a17090aac1000b0025349d7ce19mr846206pjq.18.1685412751231; Mon, 29 May 2023 19:12:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685412751; cv=none; d=google.com; s=arc-20160816; b=v/JzvrS8TZ1asKlqnqBYuYpAmpOLlx8JtC7LtxQJ9f2xwb9RVZrjKNtki2lfuY16bO zEVIyV7L+9+M723aWm4WRwAzz32NW+mLLatrlyXNKGmnQiZQuxqilGaecGv5lyNERSoC gRrqW7UOOadV/sKglwbOyUpqZt60NHhwnwzKPuM70UVyxx8dcL7H33x27O6YviTxh9PE bv9vzqCwmq1fwrOjpHIkgc8Rx4fhsMvqMJk4m/fLpmyO/pBS6bFgWwQgEtVGhqgdfDyJ 8q2ak/LioFJFkZU9n7f+p3NB+AlTt7a+7wq7BcYUN64IhpT/I3pZj5ZaBhY5ABYqE/OD YcNA== 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=ZRNRNDCKoqP4EaUu6722Asf28ywaHAK6fod38WQkMa8=; b=ei6EdwMcvFQwnIarx7de0hloAyhShlZEYFgLfjPa6H0dipBz68f6Uqin1Paxdt0T0y Y6kP5z54kNjzmbw0Aq5arHqWk1nOGKSSqDBuYp6ZH0jKX4BhZ+XwwrPELdUpRlHlxJ3b ICdKzi3va9zkY0uyHOgzIxBdBycLLDwXFyaHgqREol05t4iy8I8ys5XM8drkDeFWFVnb bIoZQ+tISiJAXnA2KRL7vpD5ZQNg5qishqMqF/GirdehRHPDj5BUDbgqx9FgKRBx54au AQt3pjKP0UYIPQhp3/Lu3IUDpGXfYUaXSw4AQ8QaT7K0BhJCQP1ERPOhWXtYwlYW8bGz dygg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=KfZ5SPXn; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rj6-20020a17090b3e8600b0023af4ee47dasi13307154pjb.65.2023.05.29.19.12.19; Mon, 29 May 2023 19:12:31 -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=KfZ5SPXn; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230013AbjE3CBk (ORCPT + 99 others); Mon, 29 May 2023 22:01:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229603AbjE3CBh (ORCPT ); Mon, 29 May 2023 22:01:37 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A73ADF7; Mon, 29 May 2023 19:01:05 -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 4QVbDR63vwz4x3g; Tue, 30 May 2023 11:59:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1685411960; bh=ZRNRNDCKoqP4EaUu6722Asf28ywaHAK6fod38WQkMa8=; h=Date:From:To:Cc:Subject:From; b=KfZ5SPXnqLZECGo7TOzigpIlRkvZ9I4GYDuzC/OoF8dC0lAzfpbIUo9ucq6pKvmvv BBdFlA9oxc0C349zdC4CoykmCxUoiUTKHjKr0/wHk2NNrTDIFsOzKZugJhZ5RVtH/f FrFrWdLh32lgf6Ztgp46o1w3mjZTQ3qXOwiFhvOVoQ6ZKlvIQn0BU9y89P6eo4WsnS huegsR9H5MfXgUpEAKHbBtZbKFyhK9StE7yl9qB0r80+KiHiVQPEiFlDrwGeOvWrra ED6k/xriABjSTrVyrX+DZaXUFCxNcfPbn9sPg9SXM/gOA5q1xfda4AnlaC74t/yGvy 2oPr3SiPF5OAg== Date: Tue, 30 May 2023 11:59:19 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Dave Airlie Cc: Intel Graphics , DRI , Andi Shyti , Linux Kernel Mailing List , Linux Next Mailing List , Matt Roper Subject: linux-next: manual merge of the drm-intel tree with the drm tree Message-ID: <20230530115919.2b8bcf29@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1767283360846348855?= X-GMAIL-MSGID: =?utf-8?q?1767283360846348855?= Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commit: 66ca1d8f222b ("drm/i915/i915_drv: Use i915 instead of dev_priv insied the file_priv structure") from the drm tree and commits: 5af5169d7582 ("drm/i915: Convert INTEL_INFO()->display to a pointer") 18e0deeed8c8 ("drm/i915/display: Move display runtime info to display structure") 95c08508e237 ("drm/i915/display: Move feature test macros to intel_display_device.h") 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_drv.h index f23b030aaf09,e9c403def9c9..000000000000 --- a/drivers/gpu/drm/i915/i915_drv.h