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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B42FCCD5BA7 for ; Thu, 5 Sep 2024 10:33:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:Subject:References:In-Reply-To:Message-Id:Cc:To:From:Date: MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=g8q3z8GHO/Kdhs0aj4nHHr1XSaDl73M/bRjVWWsBE8U=; b=qUMR4tBcnSeGUsSjjVJRVqIude rRxHLmsiM2YE8m0pSayCmkW1LhYQhBR4/CwRHp+fjEOopQLr16THZiaS3YCZdQ9udzGGjHJxqE84b sq3h4Op4iGWHXysqxmj2cLGijCVhihSP+3YrhdFBNGNsxDdZkvyJ6BBwmC5W++tziJ7i30iKnHkQm aFX+MWxPxfeD0K9eoEGPY2Fk0EsEJdkMJr5Dq9dpqTS0z7Vuto0furBj7lyQVh9XDzgQpyjqrzOFQ Zxe4LsLm94EI1Qa/5SXcYPSShfmyfzCpDNSp4zia6TNIyorvWxpYD0GOoaWFR5aK/YrOtgbnROEhN QKpCGTgw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sm9nZ-00000007yp6-3kgh; Thu, 05 Sep 2024 10:33:09 +0000 Received: from flow2-smtp.messagingengine.com ([103.168.172.137]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sm9ma-00000007yf2-289V for linux-arm-kernel@lists.infradead.org; Thu, 05 Sep 2024 10:32:10 +0000 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailflow.phl.internal (Postfix) with ESMTP id CE6A5200102; Thu, 5 Sep 2024 06:32:06 -0400 (EDT) Received: from phl-imap-11 ([10.202.2.101]) by phl-compute-04.internal (MEProxy); Thu, 05 Sep 2024 06:32:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arndb.de; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1725532326; x=1725539526; bh=g8q3z8GHO/Kdhs0aj4nHHr1XSaDl73M/bRjVWWsBE8U=; b= Nvee0sNb8RqSDM8u/7nxKnOzGz1sKnQC3cCfoiobOIykohgG1x2JtbKVIub3Y1F5 wlCRSfgit8rAkWdI0T/6WX2tEfJiXw49zVpHtK472bxvI9yvbb4xVwR8ln3XYAka YrBhlkQob3U+fNok7bds4tEF5tcF6NObvrJ0gF//y2KPRVdgssq8Kh9BmiVY9ECS pSP40l5efDe1aOEc5G1pTWJujCLR1vU4CKW73ZWtGp4QeVZuU23Kt4WNUeYIvxce CfnYPlGV1M2082UNFd5MGM11ZbdwjT66AlXPr0lY5dHc5rr6S/v+Fuq0MbSzQPjE GYGiwSb1QOeEtnkIkwvv7Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725532326; x= 1725539526; bh=g8q3z8GHO/Kdhs0aj4nHHr1XSaDl73M/bRjVWWsBE8U=; b=Y N+DgNVJPS0pwmVL5GmlXe1tNvPCYwpvy+UnAeMloQ0uXWZMxGJ++kCLKFF/QhWSF t7adOAho0hRzgHs6xQR1sspGmSdxOFoZbAGrd1ENciaAmqRBTeR0uvx0kr2QHKLC +c9PDoZ87DtH8eQjtGkaBfyL26yOnT9bbxtFU6BFmmZPaY+xbakShyk0a8MOd0nf i4izU77FfCZSPHsrcOou485n7gUCY9r0nDKDS0SpZJBY5fxIoN2kaG4xgrg6uKOz sxmUgNM2Nl1nBcoZ2FOuHhvbl2OnTljwgq89T8nhCFlKci1IkJKInFWonaLOpQp7 pazETk0EijZETM9qO4d2Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehledgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepofggfffhvfevkfgjfhfutgfgsehtjeertdertddt necuhfhrohhmpedftehrnhguuceuvghrghhmrghnnhdfuceorghrnhgusegrrhhnuggsrd guvgeqnecuggftrfgrthhtvghrnhepfefhheetffduvdfgieeghfejtedvkeetkeejfeek keelffejteevvdeghffhiefhnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrrhhnugesrghr nhgusgdruggvpdhnsggprhgtphhtthhopeegjedpmhhouggvpehsmhhtphhouhhtpdhrtg hpthhtohepghhithesrghpihhtiihstghhrdgvuhdprhgtphhtthhopehkhhhilhhmrghn segsrgihlhhisghrvgdrtghomhdprhgtphhtthhopehprghtrhhitghksegslhhuvghrih drshgvpdhrtghpthhtoheprhhosggutghlrghrkhestghhrhhomhhiuhhmrdhorhhgpdhr tghpthhtohepuggrnhhilhgrsehjihgrgiihghgrrdgtohhmpdhrtghpthhtoheprghnug gvrhhsshhonheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheprghrmheskhgvrhhnvghl rdhorhhgpdhrtghpthhtohepjhhohhgrnhdolhhinhgrrhhosehkvghrnhgvlhdrohhrgh dprhgtphhtthhopehsohgtsehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i56a14606:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 9A67A2220071; Thu, 5 Sep 2024 06:32:04 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface MIME-Version: 1.0 Date: Thu, 05 Sep 2024 10:31:44 +0000 From: "Arnd Bergmann" To: "Bjorn Andersson" , arm , soc@kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, "Olof Johansson" , "Kevin Hilman" , "Johan Hovold" , "Dang Huynh" , "Bjorn Andersson" , "Konrad Dybcio" , "Ajit Pandey" , =?UTF-8?Q?Andr=C3=A9_Apitzsch?= , "Bartosz Golaszewski" , "Dmitry Baryshkov" , "Konrad Dybcio" , "Srinivas Kandagatla" , Meng-Bo , "Naina Mehta" , "Rayyan Ansari" , "Tengfei Fan" , "Varadarajan Narayanan" , "Abel Vesa" , "Alexander Reimelt" , "AngeloGioacchino Del Regno" , =?UTF-8?Q?Barnab=C3=A1s_Cz=C3=A9m=C3=A1n?= , "Neil Armstrong" , "Nikita Travkin" , "Raymond Hackley" , "Satya Priya Kakitapalli" , "Vladimir Zapolskiy" , =?UTF-8?Q?Adam_S=C5=82abo=C5=84?= , "Amit Pundir" , "Ankit Sharma" , "Anton Bambura" , "Bryan O'Donoghue" , "Danila Tikhonov" , "Krishna Kurapati" , "Krzysztof Kozlowski" , "Ling Xu" , "Patrick Wildt" , "Qingqing Zhou" , "Rajendra Nayak" , "Rob Clark" , "Sachin Gupta" , "Sagar Cheluvegowda" , "Stephan Gerhold" Message-Id: <23cb916f-9870-4c5c-bf1d-6a281b99dea0@app.fastmail.com> In-Reply-To: <20240904215752.24465-1-andersson@kernel.org> References: <20240904215752.24465-1-andersson@kernel.org> Subject: Re: [GIT PULL] Qualcomm Arm64 DeviceTree updates for v6.12 Content-Type: text/plain Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240905_033208_816451_0B1D27A0 X-CRM114-Status: GOOD ( 10.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Sep 4, 2024, at 21:57, Bjorn Andersson wrote: > The following changes since commit 8400291e289ee6b2bf9779ff1c83a291501f017b: > > Linux 6.11-rc1 (2024-07-28 14:19:55 -0700) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git > tags/qcom-arm64-for-6.12 > > for you to fetch changes up to ba728bda663b0e812cb20450d18af5d0edd803a2: > > arm64: dts: qcom: x1e80100: Fix PHY for DP2 (2024-08-30 21:40:28 -0500) FYI, this had the same issue as the drivers branch, with contents of the previously merged upstream branch showing up again: > Johan Hovold (24): > arm64: dts: qcom: sc8280xp-crd: disable PCIe perst pull downs > arm64: dts: qcom: sc8280xp-crd: clean up PCIe2a pinctrl node > arm64: dts: qcom: sc8280xp-x13s: disable PCIe perst pull downs > arm64: dts: qcom: sc8280xp-x13s: clean up PCIe2a pinctrl node > arm64: dts: qcom: x1e80100-crd: fix PCIe4 PHY supply > arm64: dts: qcom: x1e80100: fix PCIe domain numbers > ... I assume you also included these to avoid merge conflicts, but if there are only a few trivial conflicts, I would normally prefer to resolve them myself and get a cleaner merge history. I verified that the commits above are the ones I already merged, rather than another copy with different commit IDs and merged the branch now. Arnd