From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57E50C77B76 for ; Mon, 17 Apr 2023 14:39:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229863AbjDQOjx (ORCPT ); Mon, 17 Apr 2023 10:39:53 -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?q?Ville=20Syrj=C3=A4l=C3=A4?= 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 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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. 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 +++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c