From patchwork Tue Feb 6 00:59:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 197128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1244956dyb; Mon, 5 Feb 2024 17:00:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IEcX5llntJ1QT5Ac1WmmMfdxMYvfy/2AbQyhuOHsHFnPrmdrOc4SweAX19PNS1XIL2qaOHI X-Received: by 2002:a17:906:2c4d:b0:a37:e93e:966d with SMTP id f13-20020a1709062c4d00b00a37e93e966dmr609502ejh.16.1707181234018; Mon, 05 Feb 2024 17:00:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707181234; cv=pass; d=google.com; s=arc-20160816; b=lO3wofkw0CC+xUbX37vlINswRA4XnpNaFLugvBSKcZZB7iNEJiev3vZtZbwu0htQ9W kag/5Wcj0t1aai6ICMPXzRGljSAT0KSoTeYvjRnKCd/YPI2FyYbFyWqWA1HCqmwWBIs+ c5NsCRdypu9oYXOkazxcWCo1S7+SuX4pBzhGqSftBc/nPRGdOVY+Alc5gNKo7ynSvC/R 0koaUQ5YTNNj7iZmPczEbEqYgaWgEq4iq3JYE2v2BZBxuhX7BK3NN6gDNIk++1eDE+pz p6bFQFE5Qe6URLorq4bGjzFFTsJWYnwMCkSyAuXTjnhbMcTm0bDjzgimTXQNvl/yJAPR P2og== ARC-Message-Signature: i=2; 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=mcAAzoOAVGZzLS4NHfKVIUOk1ulVMJKUzquzS0Sq5Ck=; fh=psNJy1h7h5m0339tAqvrEkrsdrOCo8EMnDEAQQjGdJ4=; b=mZWRabnHkcK7CvAmAx8KFY7FOlPXDgkemS4nYwV+94Bbb1ahOqTffjNGunLzYP/Apn pVYwZSnXgWC8cGtT2UdM3vObF9SZ13c8OCAw1Vv+ES6Ta6ZJxLY+9SLPmJJYp+KRO116 VSjscPCVzVYAq9gKK/mv6v+Cbc1EouxfF/FWXlXu+X6TAcE3Zb1Hv/K0XyUf3K4tq9NX tcXSZXEYHj7YhQBQYD0W+HVymYPGCQWrU8VmfZ6wM9v8VLmQ8gPTCl5TZev6iQHJV4Xe duROWwn0eDffRVNZ9lPn1URV9sHfPgFMelrL96ItFLkr8CT2OPTFtyvdNw9JEaRd9xl0 90fw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=MF8CPSuC; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-54134-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54134-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=1; AJvYcCVjazAEGrZlw585L6PfsdfO83TOWz2Wug6oPQrOuhMq4zAx801plzodLbKcaOkzfbS647jIBZMB/d+WUqysFRtMgMQhfQ== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id bq24-20020a170906d0d800b00a3146581e0dsi409788ejb.660.2024.02.05.17.00.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 17:00:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54134-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=MF8CPSuC; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-54134-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54134-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 8A3921F259EE for ; Tue, 6 Feb 2024 01:00:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 86D6F9473; Tue, 6 Feb 2024 01:00:07 +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="MF8CPSuC" 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 0D4FC539A; Tue, 6 Feb 2024 01:00:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707181204; cv=none; b=FmW40wnjqlcrr6RnaWp+NaP2R1NBRfZu58hNk8NTH/5ilsTXEFr3Z0dAEvMIkD0Y6HGQkh0rSjt94x3w2LJJ6QZmcTjwTvCFZTvilVeFmh2wOb1dpy4ufxPqkRmCOt75pj7vm59ixRD326WMxFMvk59ErA8W5M4mp61Q5dSN4As= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707181204; c=relaxed/simple; bh=pvr9OkLDytfZuT3AyoRYzRgHcW9tIdCf2sKbD8K4j+M=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=i2x0Mqw3c8jwo6DCfkGvOob/MFEKISCLHfW7P/LuQu1kCRsXTbduBAppxLct6P7pYWFSQbQB2axZYZosg7YnfCSUWsuEXc7x8Fs0KY74oG3DZfLIo1kwmuhOrWLjRtfRt1HM0dLUyNaHlV/X14cv9n0lxqDvYLXffbAZjakDM5I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=MF8CPSuC; arc=none smtp.client-ip=150.107.74.76 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=1707181198; bh=mcAAzoOAVGZzLS4NHfKVIUOk1ulVMJKUzquzS0Sq5Ck=; h=Date:From:To:Cc:Subject:From; b=MF8CPSuCd68GJjC8r+H8/Bmx9jzNzZwz7Hx15htJt5eohVABMsur7DU+1pWb1Ls92 J7Yun2ixb7rQTOqsXnglA/kJgVZQMykfaB5PFwt5pMMNLMrzvcDqkLjRqAL4x3Qcz6 J0jofEtekEB5U/k9DOnQUcHXnESaT6hjjweQnsKp0l4Ub4tPk5I4zLmGj8xIAa55Aw TXtImetwMyvp5+geBN6Q49MsHCCwjupJXL45ZFkuiU+ZY/QdkW0ZcqxqW4NiyIEkQ4 3z/QkFM7wEeaGQMY9hQ6yXEVnZF5LHRbHVLyjjhELCEGmKwr4jLHCCAKpARx9bzrLS vZg+uVlA7KFzw== 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 4TTPzd3NNVz4wp3; Tue, 6 Feb 2024 11:59:57 +1100 (AEDT) Date: Tue, 6 Feb 2024 11:59:56 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: Dario Binacchi , Inki Dae , Linux Kernel Mailing List , Linux Next Mailing List , Michael Trimarchi , Michael Walle , Robert Foss Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20240206115956.4570e9b1@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: 1790109269475209469 X-GMAIL-MSGID: 1790109269475209469 Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/bridge/samsung-dsim.c between commit: ff3d5d04db07 ("drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE") from Linus' tree and commit: b2fe2292624a ("drm: bridge: samsung-dsim: enter display mode in the enable() callback") from the drm-misc tree. I fixed it up (see below, please check) 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/bridge/samsung-dsim.c index 6a10aa5c85f5,f9d85fe1df7e..000000000000 --- a/drivers/gpu/drm/bridge/samsung-dsim.c