From patchwork Mon Apr 17 14:39:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 84279 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2113436rwl; Mon, 17 Apr 2023 07:55:20 -0700 (PDT) X-Google-Smtp-Source: AKy350ZXZQiMgFS1jEFRyU7NNtj+nyLPuUXhOtW+wzxwCxLcI8gihjq0kOigpZ5ejjPe9fdeuqDA X-Received: by 2002:a05:6a20:4925:b0:dd:df53:4351 with SMTP id ft37-20020a056a20492500b000dddf534351mr14894015pzb.40.1681743319881; Mon, 17 Apr 2023 07:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681743319; cv=none; d=google.com; s=arc-20160816; b=L/7YL3TWdz6hCFIjB97yq5/vSN7VfyPWd/awwq7Lo7xF8xylTUz2Wi1a4MaoTA/LxP hUHUg7kAeGdNgaGtb6cyKRvKZhlxM1j8icoC9M8f6GzEAmFdu/2J7lpVSDf0D3tN8bJY KI/rSz4UOAbSkRYUvYa97vlcVOfIBidm1PYw5feduSayWH0/JpGg7hexxVFgjaLKxetR hCBPLlY+31mXwj5nmIF6staXlFoh/l010hMM0tWUCGWcidXATSilSkKDnvWCv9crnzak +AelYg184fyt+wLBUNo5KmSJK/S3CyQ1UyfqEk2+Sxm3r4BYqBSlhGHnK31QQ+XPtTif f+pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=pcjIqty+WXuvXUjSfx4cp7Cafuu+GD6tCddUrG9mUL8=; b=UoNeLeYhdkQaAcmwr5JDCZV1FZ8q6Z9K596FOx2jX2zBbgEdBC6LMThU2NqoFqBkqr QBVgrH/a3OlF1d1/nKDAaMWWKqOOK0BJGOoKYog9Mp4pdEMfoBiPjN/yHubhoCaas4Xh DuBLvmFMV2VNcVM4tQf04GvHTYlSwt0+Ri+TM7MVThUpOhkVDdqdNT33ak3qH5PGWCSS EIMoNnrHwRzpfVaIO4qG5iz+Us5x2B6pqgPL1rP1FzK4JV6+PKQDHmD5AvvpM7n+uRn/ xGy0qlAc8+3nCO/QyFV8XvNz6pZRB205t29VcOUKe1NseGEWQ3FtWBc+lwFSly1wiE67 T53g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KWw03S2b; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bv126-20020a632e84000000b00519a3fb282esi12514402pgb.864.2023.04.17.07.55.04; Mon, 17 Apr 2023 07:55:19 -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=@kernel.org header.s=k20201202 header.b=KWw03S2b; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230199AbjDQOjy (ORCPT + 99 others); Mon, 17 Apr 2023 10:39:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230049AbjDQOjn (ORCPT ); Mon, 17 Apr 2023 10:39:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EB4D86BE; Mon, 17 Apr 2023 07:39:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7FE856262D; Mon, 17 Apr 2023 14:39:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B522C433D2; Mon, 17 Apr 2023 14:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681742367; bh=LTTln81pU3tbmAEDXucfOA7gxmfn0aHgrBX7aTXJ72k=; h=From:To:Cc:Subject:Date:From; b=KWw03S2bX6ty62CMEBwRHiWNsa7WKHIf2dy9Mw+vo8zKfKnII4QYxPRTdNZn3OSys o7KvJ6G+0sKRoqv1OG3hbzQ5yz4YrG0QQ1CrYw0bazhg0hnHvQPrkAxeNUkelhlPQz XCcWPDMN1/xh/s4dqbenWCvuvFAOkULifUJciYX0CJEzwQyvobwSLkD2Gt4974OwWv K5XNhOs2zzPePJyeY9WsB6xSKGEXzOjd/OH2Yr6MM82vhuiexQHEIZblE9MQ8QeQHK zvfhqQlLpQQVqJX5J7RriLijAFzrq1bCmKp35/9x41Fq0JUtyfVBeL7Z0Y7pgewKt4 ZYLZZIUWAkbYQ== From: broonie@kernel.org To: Dave Airlie , DRI Cc: Jani Nikula , Linux Kernel Mailing List , Linux Next Mailing List , =?utf-8?b?VmlsbGUg?= =?utf-8?b?U3lyasOkbMOk?= Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Mon, 17 Apr 2023 15:39:23 +0100 Message-Id: <20230417143923.2136597-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1763435683113179769?= X-GMAIL-MSGID: =?utf-8?q?1763435683113179769?= Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp_aux.c between commit: e1c71f8f91804 ("drm/i915: Fix fast wake AUX sync len") from the drm-intel-fixes tree and commit: 605f7c7313334 ("drm/i915: Fix fast wake AUX sync len") from the drm 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. +++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c diff --cc drivers/gpu/drm/i915/display/intel_dp_aux.c index 30c98810e28bb,705915d505652..0000000000000 --- a/drivers/gpu/drm/i915/display/intel_dp_aux.c