From patchwork Tue May 30 01:57:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 100501 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1887023vqr; Mon, 29 May 2023 19:21:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ62Zinx+3rXMhPzhD8CY6gO03Gp5F1CZLJTw0KysD33mRDBb47cxFurDmPbA3O7WvgNnzyZ X-Received: by 2002:a05:6a20:394c:b0:101:5192:18a9 with SMTP id r12-20020a056a20394c00b00101519218a9mr913913pzg.21.1685413269195; Mon, 29 May 2023 19:21:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685413269; cv=none; d=google.com; s=arc-20160816; b=0F4JP7+Dbne+JuUW4OZF/Jqpcz4XqskGjjkb84q2efXlyavsxxtWbbIBDSPf6c4xJ1 gEDQwxV2246YU6D29EfU1L4N+0gV3AAJDRkKKsy7jHH/5FwQGty1uXwe7LI1hBFhJ75r 8V+uQNKetoOYTAoCgsuKM8ieWmv9yHoPWz1XazT9j6yT8xNQFBt6Ipj3XAGNT7biaGTg JYU5RKskiSf0VvjtiXPx87v3RPh4MGMZVfJwdUY3B8IZdqti6hx+oJ2wjEfV+NVMf3Rg s2petIWZOEsfZ1hUKllc8D7glY7q15nQyG6zuYIDhqupdDyagsUNpglwxjvr8LsQGVVV c5TQ== 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=F4lGD1/qKcCBYCrQ7p5cZ8cJZ8QFNHvhrDk22QJDn7c=; b=mWws8JE/khFVmq6JmLmPJPRKrrcLlKcJTAjXndjnZ5TYZksBabo35X0gKJFapW77Py IUOufU17WFy5QgLQAXwCfFCKneC6Fx5vA9ZwnwYFXq9bEDRZa6KcvO5t59o/0UmCOA9N x22F8Cy/I+5sMl2s1mcsPaDtGg++dmmymQGNYHaC2LEfKOAni84M07Lax/5Leto1KtEb BGnpwg/0ZussLT8MWC/YqwWbxvS7gIHWWs1RXhlG8M/VmsTAiCNkCEpyF/TyTxhvx7nq +Hr4gusiPxD1Daqf1wEnJVnPnw18RG9iGFxi5ogQt7IVQ2ojGryoOhb/Yjnh0xQ48nd+ hqgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=soa0HbXz; 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 k26-20020a637b5a000000b0053b99f632c9si4351925pgn.842.2023.05.29.19.20.57; Mon, 29 May 2023 19:21:09 -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=soa0HbXz; 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 S230030AbjE3CAt (ORCPT + 99 others); Mon, 29 May 2023 22:00:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230026AbjE3CAq (ORCPT ); Mon, 29 May 2023 22:00:46 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 820561A5; Mon, 29 May 2023 19:00:12 -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 4QVbBp3YVbz4x2c; Tue, 30 May 2023 11:57:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1685411875; bh=F4lGD1/qKcCBYCrQ7p5cZ8cJZ8QFNHvhrDk22QJDn7c=; h=Date:From:To:Cc:Subject:From; b=soa0HbXzRLHOCK7pYNUw3wzZ77a4t4M4+0TVLqLFRreQa2DW2sx2U+tAPLdCbgGjj wKpAZfNVY2f0vqHBzdfWhAm+azgXqW9gBOY2DhLdjdL/ARoHx0C/Nz+DMTt/1GJ0Lh XMvf7EAvLVy2Je57xaOTu4gdA3XkfZ44UNmXikWhMCdXIso7Hqy4n4VjgGXjhpwM7i FboT0C7M2aUsQbRsyciOquUCM3PGG6b5GAGAosmA2xRfS5XLTOmh6B4IbpiWw/FM31 u42BndVNbLsKNz7Miv4tV8kZRtd9UZTHGH2PiiQGkxpWPrP6PSTZCdxrDcQSkXtI7k ZEhnarHD5FCRw== Date: Tue, 30 May 2023 11:57:52 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Dave Airlie Cc: Intel Graphics , DRI , Andi Shyti , Fei Yang , 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: <20230530115752.14f0f1b5@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,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?1767283904376678682?= Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_pci.c between commit: 5e352e32aec2 ("drm/i915: preparation for using PAT index") 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") 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_pci.c index 75cbccd1a441,34bc732a6375..000000000000 --- a/drivers/gpu/drm/i915/i915_pci.c