From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 67B2932E6BD for ; Mon, 13 Apr 2026 12:06:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776082005; cv=none; b=cpaBTsFwE66lRIX2bigdHBW4ADiE0yzf0XD0CXq51r+yIxdifztG320NdEPYxHIYliUzRD0RxT7BcwBPYqMRSJAoZPJRyVD66YNnytM1s/ImssR1GRT0+lEq2ePkDsZF8DTZtdlLqRTv6mOFtHIvfSrIdnYG8ruAW0vPRsHbtSE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776082005; c=relaxed/simple; bh=JjOuypucc+oAH9f3I54PR6Y2kju5pK0Ot9QKV6MQZBc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=KBx9fDWhFxbS8ER/gV1RAaU2oMNeAhCwKSEa5iPSrG+OivAFuayPR78Dg7GpwIJtNtPEzLA0HaNqSstLBghzgnJv6d32EI1OCjuEv/Y/MYZqEUTw8gd/Zz9SPO5bz56ZDDI4Q1QbKuYVRVi1gKcOYYNT6J2zD8kK7Xzsbt1plLw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ZaidiXAD; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IBJX52+Y; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ZaidiXAD"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IBJX52+Y" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63D790xV479862 for ; Mon, 13 Apr 2026 12:06:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to; s=qcppdkim1; bh=1Y9946GL2rljH3xCRftmtO5s cdnSGW8EjB0hBdNVjE8=; b=ZaidiXAD3zZ7CIDtNU8+XV8Qpf6+5eHj+1GvOE+1 Ln1Nb5ARJOswX3IvEBYm3Wrz0yGOJ93UIXwXQE8xQiQlpXt1wTI9npI4rYvkAFZ6 HmPU2eUtu3rGDWukkWOAoqYhwcPZu/domyBkxLyH98lxayLo9pH6qsSgjVbLVNdA OluqSheqGsd56ppcXxxgcKsSrCCEd3KAAfgNRbT4JOZ4gzrq+qN1SUUIJsbQZgME 9NcTigZGYxNeTjYvz5nef+IpSDQYWOyMcaQR1atgZqkFpMpByI5TN2w/p1gERIEH blzhY/265zkvg93x9G+IneEawSI4UIhNRRL6g/z8uwfoYA== Received: from mail-dy1-f200.google.com (mail-dy1-f200.google.com [74.125.82.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dguuj8ypp-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 13 Apr 2026 12:06:42 +0000 (GMT) Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-2ba9a744f7dso5463384eec.0 for ; Mon, 13 Apr 2026 05:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1776082002; x=1776686802; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=1Y9946GL2rljH3xCRftmtO5scdnSGW8EjB0hBdNVjE8=; b=IBJX52+Y2vIvvOG+u+Y0O/gCjQDcdzo6FHKfkTUft/OgrC+yGL2bX7DR5ja4GHEGHL xxaykuJuUG3aYg0ALHmKu2FHNpOh+34JV13LB1WOqQyLJ9UJCwAzuA0OcST6J98DDC1e WsGHvhqGCS52y2RoZqF/8FQOAaVOj6o8HBF+ZKADkvRl0TJ9ziNLiY1jWrN5PnLSSdKy SF6KLGIaZFc+RHRN12i51jOE84ejhoUNkunuzHwM1Vdp7g3dsliipZOMvFMJGZ6naEq+ pkGhZ8y/g1mhpY84zLiz8NXCgjoWv54D2CHkA7e+gyvWMzIZIanOmeLxgxLHVaylc0iE Zr2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776082002; x=1776686802; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1Y9946GL2rljH3xCRftmtO5scdnSGW8EjB0hBdNVjE8=; b=ld8w8o7lrYVPmXtN92/EN9QiCoAdd9izazjQayEJNNbBMf4BOiOemet3k3kEMtSupc lCf1Wd5cb4cA+w0qySKORHFxlPStxs05wLZ3NtUYuECWeLOmNEplCul9Z+Ampr9jjycu zw6mHXzbAf9cMujOGzkIb0hq0Bg+7KnEX0uZeN83AEUDkf8CYQOvCyMAnKza8bxiiD41 +jThr5+l61/EifagYJo4ICKbJXpEEM0HwBSSeuoI6Grd/xKtm2cesIKFAuHiG0yKJgRV xh9c+gtueTEkscQVsnPG2ZAI42aa3U8Dn/FHI3mlHRJMaSE4eWhzZBo4at2XTY5Du+Cq CX3w== X-Forwarded-Encrypted: i=1; AFNElJ/v5IW97H1MhWjMyrKLPLW6naKC5q29f+d4n4sU0gEfuYnrwbLbzJoMLlS+mU7ZYm5aZortEfKz4ONL94g=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7pdPB29xSieTLIrARzuTYrd85A95i1eYM9FBUKOsYY4Rmu7nv /DxKsx/csFarjSEmMH9nGtBeOo4vfkG2WAag7tQKluU5KxfTolLa75+2NdSjVjtIABu/nDKb+Jh BL66ryW8PeKWAAD+OotPPib4kBOKybHc/0DDH1fWGQuG/ey3i1/RrSK0sFF8qtsbZOtY= X-Gm-Gg: AeBDievCCl8lqzu5zh4SI8kBnAKGMGmnoMglTNh2OVyCQ/dnjCR+RQD2OQi0l67cOPD G0QJ1sr0CH31XmwYG6NGGTD0C58r/lY+eKrB7Ak6RnftRpNREmHB+/aNanXMphJM2aE7q8FqeZP 5/MuL/52gaW2H3Q+EcUhVnV8+lFKVXsQhrNgU0Zdk/ShZ624cLNYuZQtRDonGm3uX22N2iU9962 2Gov8tLJ+qYL1JVopURUosbr7TLLaoDW/mw/E91Xtj+73qUgLFQ5xvjEuwfCLfScmPUfAH7WjFS dTK/pnPZ4wm8PAi3NrrO96JFNVeMw4SxfvZnpnE6iQXsTvLvhkjhrFGS1w1rb4/KzEDPxuKNV8K iUolSVrfrGmnIKx/2q1ao8zvW1KqMV8eC0g0/S20n2WLflSuJUHQJr3aGDp6FHOHD X-Received: by 2002:a05:7301:1e85:b0:2d9:6373:ad09 with SMTP id 5a478bee46e88-2d96373b0e4mr1468026eec.25.1776082002079; Mon, 13 Apr 2026 05:06:42 -0700 (PDT) X-Received: by 2002:a05:7301:1e85:b0:2d9:6373:ad09 with SMTP id 5a478bee46e88-2d96373b0e4mr1467997eec.25.1776082001418; Mon, 13 Apr 2026 05:06:41 -0700 (PDT) Received: from QCOM-aGQu4IUr3Y (i-global052.qualcomm.com. [199.106.103.52]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2d561cd3138sm16163467eec.14.2026.04.13.05.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 05:06:41 -0700 (PDT) Date: Mon, 13 Apr 2026 20:06:35 +0800 From: Shawn Guo To: Krzysztof Kozlowski , Mark Brown Cc: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bartosz Golaszewski , Deepti Jaggi , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] dt-bindings: arm: cpus: Restore qcom,oryon-1-4 compatible Message-ID: References: <20260413091625.607976-1-shengchao.guo@oss.qualcomm.com> <20260413091625.607976-2-shengchao.guo@oss.qualcomm.com> <21b3eca0-c8a3-43c3-ad61-f15abedf5c7e@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <21b3eca0-c8a3-43c3-ad61-f15abedf5c7e@kernel.org> X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDEzMDExOSBTYWx0ZWRfXxq9IgPuAS1gr 3hvmZ20lnWRhZspdmeupSTqImCxg+qjsIWDGYCOR5AByhA7vz9Oub+B2InNHWaAzAg9/ht4Y5er DGzf7vZZYNqHV9/CUALwn8r4KLp7OBiexKARp7OcrpphOBeXCfQLdJWK39iV8JLvV02t2pYALTI TT9dYegT+RpzC30G0zeKnkZ1MPRzy9V/ujo4uDerOqwiBC4jVGJdHTh1HF8hbaaAD2S3h87sbcf SiFup3GP0R62q6lfiA0KlNZeUBYxjEmO2QJrpmdUbMXmhNFWhtfX4o5JwogaDBOdCVp+mYZ0mxa 7o/TsRRTXon45FRQvRG3GCioaoUfOCv9Hem8rmf59jFTAbL81hE+HOAT8WR8rOgktw+DWIrpqbv JrDQpf0Q8NIKDxJhaceELaDVBbXJu5dS2opBQ0V3xClmycx3ckA2/AGRypr3RVUPoqdE/mc/rEc tKKCb0OhUVzF8bLgtWA== X-Authority-Analysis: v=2.4 cv=c/ibhx9l c=1 sm=1 tr=0 ts=69dcdc52 cx=c_pps a=PfFC4Oe2JQzmKTvty2cRDw==:117 a=b9+bayejhc3NMeqCNyeLQQ==:17 a=kj9zAlcOel0A:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=8ZdYE9b5z-9qtW5Q9UwA:9 a=CjuIK1q_8ugA:10 a=6Ab_bkdmUrQuMsNx7PHu:22 X-Proofpoint-GUID: 1tbfc7xN_7yc3RAmIPJuOwaPMIL6b1Th X-Proofpoint-ORIG-GUID: 1tbfc7xN_7yc3RAmIPJuOwaPMIL6b1Th X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-13_03,2026-04-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 spamscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 phishscore=0 suspectscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604130119 + Mark On Mon, Apr 13, 2026 at 12:01:06PM +0200, Krzysztof Kozlowski wrote: > On 13/04/2026 11:16, Shawn Guo wrote: > > It seems that compatible qcom,oryon-1-4 was accidentally dropped during > > the conflict resolution in commit f6935ae6147b ("Merge branch 'for-next' > > Don't reference commits which will never make to Linux kernel. > > > of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git"). > > Restore it. > > > > Signed-off-by: Shawn Guo > > Well, I said that merge will be difficult but Mark was sure merge is > trivial, so here we are. > > Anyway, this cannot be applied. How do you exactly see it? Which tree? > Try yourself... Ah, right! This can be applied nowhere, as it only fixes Mark's merge commit on linux-next instead of mainline. Mark, I should have copied you from the beginning, but could you take the patch [1] as a bug report and get linux-next fixed? Shawn [1] https://lore.kernel.org/all/20260413091625.607976-2-shengchao.guo@oss.qualcomm.com/