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: 13546489 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7E720C4828D for ; Tue, 6 Feb 2024 01:00:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B7CF410FDDB; Tue, 6 Feb 2024 01:00:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="MF8CPSuC"; dkim-atps=neutral Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6163E10FDDB; Tue, 6 Feb 2024 01:00:05 +0000 (UTC) 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> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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