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 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 3DCE0C48297 for ; Tue, 6 Feb 2024 11:35:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6AD5B112AC0; Tue, 6 Feb 2024 11:35:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="DzsqcT4/"; dkim-atps=neutral Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id A8920112AC0 for ; Tue, 6 Feb 2024 11:35:11 +0000 (UTC) Received: by mail-yb1-f173.google.com with SMTP id 3f1490d57ef6-dc6dd9bf348so4713245276.0 for ; Tue, 06 Feb 2024 03:35:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1707219310; x=1707824110; darn=lists.freedesktop.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=ipIFPiuOZlL03JscPcnqfUuXdCqKvtPZ/moGeh3312s=; b=DzsqcT4/hPYPeAxywb2kE0gW0ox8lXL9rEqE4t3gdXLu/QrSHFdO/3Ckt/+S5ToIlZ KMn0Q5V2XIUP84lpzvh+Mv75cQs0Uip+u2TTvzSRwN1OWYlQLzS7VS0iweINMkGmO9I2 M8Gu14PjklUEmLnc1tiUY/y6PAxi4DI8C6qI4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707219310; x=1707824110; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ipIFPiuOZlL03JscPcnqfUuXdCqKvtPZ/moGeh3312s=; b=Xs+1V88MyJeg0E9swaRQ5Mao4ZZu+zRGQmlsjrtV2yWDXgv4bbDkvNsfsuOsnFV5l8 j2heyvCeTLR2vwntK17EmeCHj3HJy2clxgBwCYW9ghylG1/wAX4VkAYomUntVSw0KXJA N8d9efjsk9WipeNaurej/msUpxayxFoCCTlcCbpLgU/em2GTaMfeGVL7oKWmx2jZIIAD IFkJiL4ociDoioH7OCSXIWzzm3pTl9WELn7Ja1oDrnyWCfinlloCFVh88UKlg4LCMhUj L3yuJmZXfyDBIEON8YSxwKqwXAovzxeHJcFCUJOG/2WBULX1AqmT5xuSJ21fZJFFXoa7 Qvew== X-Gm-Message-State: AOJu0YyYKlQjK3cAfuWXqACqDwe0AgwLxld0GeEz7K06Sqs2tr8/HLq8 U/E4zGfOU2ScK+J4/5C6xdo/8wXvMsnNqEek2sFb+rFfNfjcDFCbYFOYWskZ14vu3rmsyyWyZse rxGzb/KRd6eYRxHcpUZ+RUNOHaI/LT6qTNdfgrH7JGd4sb2mRXBVWfQ== X-Google-Smtp-Source: AGHT+IFs9N+MMWXICUW8m7zjdBDfxfxKrJHf8SDeiP+oYRkgDorOT5XmQOl5gAjCH+qk4NmEovj7aTrJBhpDMGxfG60= X-Received: by 2002:a25:824f:0:b0:dbd:b081:9663 with SMTP id d15-20020a25824f000000b00dbdb0819663mr1120369ybn.41.1707219310352; Tue, 06 Feb 2024 03:35:10 -0800 (PST) MIME-Version: 1.0 References: <20240206115956.4570e9b1@canb.auug.org.au> <20240206120643.1d30764c@canb.auug.org.au> In-Reply-To: From: Dario Binacchi Date: Tue, 6 Feb 2024 12:34:59 +0100 Message-ID: Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree To: Michael Walle Cc: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI , Inki Dae , Linux Kernel Mailing List , Linux Next Mailing List , Michael Trimarchi , Robert Foss Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Michael, On Tue, Feb 6, 2024 at 12:29=E2=80=AFPM Michael Walle w= rote: > > Hi Stephen and 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. > > > > I changed my mind and just used the latter version of this file. > > Bug wise, this is the wrong solution. Because it will reintroduce the > faulty FORCE_STOP_STATE. Also keep in mind, my fixes commit is/was > already > backported to the stable series. > > See also the discussion at [1]. Unfortunately, there was no conculusion > yet. > I think [2] is the proper resolution, at least for the commit > b2fe2292624a > ("drm: bridge: samsung-dsim: enter display mode in the enable() > callback") > I'm not sure in what state the drm-misc tree is. > > -michael > > [1] > https://lore.kernel.org/dri-devel/CAPM=3D9tytMB9frxNeD08hu1qsusY=3DwEE3bJ= OFmUgA1rSpabwDpg@mail.gmail.com/ > [2] > https://lore.kernel.org/dri-devel/31e1a38a1d012a32d6f7bc8372b6360e@kernel= .org/ Unfortunately, in this recent period, I have been very busy and have not been able to run tests on this matter. As soon as I am able to do so, I will. Thanks and regards, Dario --=20 Dario Binacchi Senior Embedded Linux Developer dario.binacchi@amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info@amarulasolutions.com www.amarulasolutions.com