From patchwork Mon Jan 8 00:14:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 185772 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp759249dyq; Sun, 7 Jan 2024 16:15:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IGtyAbjpBsVuwW4QCHbaNK/ZPRZjv9JVjoL5DcxutRpmI9nAZp7Ap7o3TAmgohZUgQ6nmXT X-Received: by 2002:a05:6214:2aad:b0:67f:b784:a00b with SMTP id js13-20020a0562142aad00b0067fb784a00bmr4062442qvb.120.1704672918868; Sun, 07 Jan 2024 16:15:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704672918; cv=none; d=google.com; s=arc-20160816; b=rV1xMAVU9AVMwcBnR4Zjxp6f8hDfTCOsNYK63IcZ0KOZhlvxNBmJulX9zH3oUDiuEy xGqKDYdwFqcnvb4Pkn6ZQgL/U4CxUWDI3B3pW3H/oT134+JO/cpE3FmqL4uQUE3DY4xA hdsO+0s1FKRbwEkFt86ClUJyEP5J6CDR/HscPOoS7Sjad66DpFlvyHbtHc3VncdN5thy dU4cf81M3OrN2xbFhZYaRp154mXRDnTMOemnwt7AtrR4g/uMkzUa9XzvKccTKzKdjJYS HjIMFLbdI3FWlBu6WUcvzPPc2tEJVpNnU2DC4F6YOrBiC9814kmYHwv/mMcxpu9oZmTR lLbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=037L4Bx9N+1mGd2j8MWjXO0307K1Ky4m2b0KGWg3Ki4=; fh=X9JLQhs2kdhgQUCgG65ZPKIzMVX7pYb3BtNVw9OFmDo=; b=xnRF6qlPS1xiqZ9sEEwZmO1zlqKMr4Rc+GKdfhvhi0D/URArmU789XLGcwZrraHvXh tN6wQIiA9XZNBB44ihGKNtL86khSyidzZvniQLG+fl7+fV4mc4jfKTQin1AIDhLcmG61 rVTqTVc+iwU8SRowpo2vxjihM8lzPvqwejbSSW6SicjnDqUed3C8rQ/kWHtUq89dPgye FsVjjEuxW14OEdQw6shXT+NNa9/tQ8EtZI64n5kbNSF0855eCMNHhKuWQEcm3BJM0Gwk Dk4s3DOzLqg0PaigIG4+QlxljMF1Pk9paCCT/AFj8JjS/GkdDYaA9Ee0Y7dSqFb1bCm7 FBCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=OmsTBqF3; spf=pass (google.com: domain of linux-kernel+bounces-19022-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19022-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id x1-20020a0cc501000000b0067fd61f5a96si6749757qvi.256.2024.01.07.16.15.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 16:15:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-19022-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=OmsTBqF3; spf=pass (google.com: domain of linux-kernel+bounces-19022-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19022-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A53CE1C20B36 for ; Mon, 8 Jan 2024 00:15:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EBFBA8BFA; Mon, 8 Jan 2024 00:15:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="OmsTBqF3" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CB337497; Mon, 8 Jan 2024 00:14:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704672894; bh=037L4Bx9N+1mGd2j8MWjXO0307K1Ky4m2b0KGWg3Ki4=; h=Date:From:To:Cc:Subject:From; b=OmsTBqF3bIjUT99Rllsfo2snosICcCsQ6sj3p+4AS6+xGUpGG/ohO7cdEGBazQH4j FVKehnO4OEMo16FBlVhbk0wPr1f+q2A7m8n9OpvMjogj3TlxsdHLJKEaUxUdmAJVy2 PfgBUNuCfK75gF0gHCvURQ6NHAyn5nEJR9UmZli4xketp9bqujkP1NCfTE41MrxtkT UEt7BOh7Mko8Sp7XXFpZXFj9JsQOq9E3UPHcMfXeoTp3h/4JVGq+C2betAPic7uFf0 w/HwVbC7qYNOmgZy3cZpOtpCN+Y/X3kVJxOd9WxuY0KM7aZ2S6asWbx/4JVOSTxMX7 HE8tSVNuKMaOg== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T7ZM10SZmz4wdB; Mon, 8 Jan 2024 11:14:53 +1100 (AEDT) Date: Mon, 8 Jan 2024 11:14:51 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Alex Deucher , Imre Deak , Linux Kernel Mailing List , Linux Next Mailing List , Wade Wang , Wayne Lin Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20240108111451.67c34a93@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787479110715893839 X-GMAIL-MSGID: 1787479110715893839 Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c between commit: 9cdef4f72037 ("drm/amd/display: pbn_div need be updated for hotplug event") from Linus' tree and commit: 191dc43935d1 ("drm/dp_mst: Store the MST PBN divider value in fixed point format") from the drm tree. I fixed it up (I think, 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/amd/display/amdgpu_dm/amdgpu_dm.c index 73dd4bc870dc,54861136dafd..000000000000 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c