From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f172.google.com (mail-yw1-f172.google.com [209.85.128.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63189130AD4 for ; Tue, 6 Feb 2024 11:35:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707219313; cv=none; b=gqhzMBDOF7nKMs946nIwbcQe+tF2YiBY+Eh4+G1MPPGmG9iDUXELzw82puzIxcma4YzYpJACcpZ99Ly/LERy9XSxBHtY1ce3CacGqxQvJb2nUiNDQ/Mc9HklHie1nt1lQcDm2fzgChHhmzvTst6r6MZLCcYFZeX6a8Y/mVhdRM4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707219313; c=relaxed/simple; bh=lMuVwqT6Yqxx65gjRWAsF+EhieMFDPtXh3GlqRjPYKo=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=Ctg/Zr/crAW0JmwipKIXlHwWZO9EcXomamksKYVlCrTh60heagZFqY4GjnFMNzArnrudc2r9CAMUjGc3Hlq++L0yNJvpcsIWQINjULkyBShhgEWCQTFDCVyl5X8XfnxolpSxEkCXCSef53+sgwUR27Ng9mK758N9DHE3SUz4qSg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com; spf=pass smtp.mailfrom=amarulasolutions.com; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b=j2h3juMt; arc=none smtp.client-ip=209.85.128.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amarulasolutions.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="j2h3juMt" Received: by mail-yw1-f172.google.com with SMTP id 00721157ae682-5ffdf06e009so48369477b3.3 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=vger.kernel.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=j2h3juMtbfaN4OcIC4NdUaksHDKjKc/FjNqyJn1K5ppCDX+tjixVO8y+kuq4LVMvmu SQ5IJLP03itlEPuKIhS4k2ZUsg6CKt1H3XuiRbJyLyG9X2n5RA/bTB7aV6yLDez24ZFN J404lG1Zwlon5I+XgAnEmRCLM26wB2gu7Gpv4= 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=UgO5nPDGy7quVg5v7rbNXBR0CVcD1CIp2acFkxStLxNKal3UXZ8Z9c2rLH/4FOZoqP 1n+bXwTuK3qN2vxtmfUWghs1neSuC3eeViSxqfjb5xXxqO1T5YaNDaojvK/uY0pomm+S f/zOxOM2Uhb4s75Do+2X6FoD/M9yCu9h33akFeCnZSmsxTTsGkJFsZlnvUDrtFSn7bV7 q5TDzen5HMW7NPufFgxRCLx/WsiDI+LQChim9jneO1vyHfpmFEwne3OGaLDZZYkrItKW KwBYSJ0M+0i8TtQNDfb2WuZASom+X0V4AEQOh4aS+11m14Qcqfa/SsJOYyDMxrGURxNk S/7A== X-Gm-Message-State: AOJu0YxsrTuBQLzjRJpTWzr6uxdVs9KH68iatUlql8mEVzdRO7iXWCZI ac8XWwRK9gLVDlMrdi8jO53UZAnd16+T7zSQsHQpBZOi7dbLnnxFMJ7nF3s1W8wb/fe3mQogp9a FN8fBkUVDCs72lLE77291xsFlEBEiZcP40Yjd9w== 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) Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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