From: Bjorn Helgaas <helgaas@kernel.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>,
Andy Gross <agross@kernel.org>,
linux-arm-msm@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>,
linux-kernel@vger.kernel.org,
Manivannan Sadhasivam <mani@kernel.org>,
linux-pci@vger.kernel.org,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
devicetree@vger.kernel.org,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Rob Herring <robh@kernel.org>
Subject: Re: [PATCH v2] dt-bindings: PCI: qcom,pcie-ep: correct qcom,perst-regs
Date: Fri, 13 Jan 2023 16:47:49 -0600 [thread overview]
Message-ID: <20230113224749.GA1867364@bhelgaas> (raw)
In-Reply-To: <9016ea51-9ca2-551d-d4a1-0b70232b5dc5@linaro.org>
On Fri, Jan 13, 2023 at 03:23:18PM +0100, Krzysztof Kozlowski wrote:
> On 13/01/2023 15:03, Bjorn Helgaas wrote:
> > On Fri, Jan 13, 2023 at 10:02:27AM +0100, Krzysztof Kozlowski wrote:
> >> On 30/12/2022 14:42, Lorenzo Pieralisi wrote:
> >>> On Wed, 9 Nov 2022 12:32:02 +0100, Krzysztof Kozlowski wrote:
> >>>> qcom,perst-regs is an phandle array of one item with a phandle and its
> >>>> arguments.
> >>>
> >>> Applied to pci/dt, thanks!
> >>>
> >>> [1/1] dt-bindings: PCI: qcom,pcie-ep: correct qcom,perst-regs
> >>> https://git.kernel.org/lpieralisi/pci/c/68909a813609
> >>
> >> It's still not in linux-next. Is you tree correctly included in the next?
> >
> > It's on Lorenzo's branch
> > (https://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/)
> > but I haven't pulled it into my "next" branch yet. Will try to do
> > that today.
>
> If Lorenzo picks up patches which at some point are merged by another
> maintainer, his tree should be in linux-next as well (and in LKP tests).
> Otherwise we loose some build and test coverage.
Oh, I remember what happened. I started the merge a while ago and
tripped over the conflict between these:
dt-bindings: PCI: qcom: add MSM8998 specific compatible
dt-bindings: PCI: qcom: Add sm8350 to bindings
I asked about splitting the first and if you did that, I missed it,
and in the meantime I got distracted by my E820/EfiMemoryMappedIO
regression.
In any event, I updated "next" with this. Check my conflict
resolution because I'm not a DT expert:
https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/tree/Documentation/devicetree/bindings/pci/qcom,pcie.yaml?id=25cfdd48a4bd
next prev parent reply other threads:[~2023-01-13 22:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-09 11:32 [PATCH v2] dt-bindings: PCI: qcom,pcie-ep: correct qcom,perst-regs Krzysztof Kozlowski
2022-12-30 13:42 ` Lorenzo Pieralisi
2023-01-13 9:02 ` Krzysztof Kozlowski
2023-01-13 14:03 ` Bjorn Helgaas
2023-01-13 14:23 ` Krzysztof Kozlowski
2023-01-13 22:47 ` Bjorn Helgaas [this message]
2023-01-15 11:27 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230113224749.GA1867364@bhelgaas \
--to=helgaas@kernel.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).