From: Rob Herring <robh@kernel.org>
To: "Krzysztof Wilczyński" <kw@linux.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Bjorn Helgaas <bhelgaas@google.com>,
Lorenzo Pieralisi <lpieralisi@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patches in the devicetree tree
Date: Wed, 15 May 2024 09:34:47 -0500 [thread overview]
Message-ID: <CAL_Jsq+1bYtSm_eTAo9q+ZS3ZzODbnkiCRNa6tOLU5HPUfny8g@mail.gmail.com> (raw)
In-Reply-To: <20240515135008.GA450088@rocinante>
On Wed, May 15, 2024 at 8:50 AM Krzysztof Wilczyński <kw@linux.com> wrote:
>
> Hello,
>
> > The following commits are also in the pci tree as different commits
> > (but the same patches):
> >
> > 15be4f7ce5de ("dt-bindings: Drop unnecessary quotes on keys")
> > 28081ebd17fb ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
> > 649bad67d4b1 ("dt-bindings: PCI: microchip: increase number of items in ranges property")
> >
> > These are commits
> >
> > d7890a80e037 ("dt-bindings: Drop unnecessary quotes on keys")
> > 301e978b9eb7 ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema")
> > 247edade4b4b ("dt-bindings: PCI: microchip: Increase number of items in ranges property")
> >
> > in the pci tree.
>
> I took the last two, and dropped the first one, per feedback from Rob.
Normally, that's what should have happened was my feedback. That's not
what we should do here. What you've done means we *both* have to
rebase our branches. Since we're in the merge window and I've had
these commits in my tree for over a week, I think you should drop all
3.
I only picked up the PCI ones because they hadn't been picked up in
over 2 weeks and the merge window was approaching. What's going to
Linus should be in linux-next before the merge window opens. We're all
guilty of bending the rules there, but that should be the exception.
Rob
next prev parent reply other threads:[~2024-05-15 14:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-15 3:01 linux-next: duplicate patches in the devicetree tree Stephen Rothwell
2024-05-15 13:50 ` Krzysztof Wilczyński
2024-05-15 14:34 ` Rob Herring [this message]
2024-05-15 14:54 ` Krzysztof Wilczyński
-- strict thread matches above, loose matches on Subject: below --
2024-01-21 9:33 Stephen Rothwell
2023-12-18 5:42 Stephen Rothwell
2023-12-18 14:07 ` Rob Herring
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=CAL_Jsq+1bYtSm_eTAo9q+ZS3ZzODbnkiCRNa6tOLU5HPUfny8g@mail.gmail.com \
--to=robh@kernel.org \
--cc=bhelgaas@google.com \
--cc=kw@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=sfr@canb.auug.org.au \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).