Received-SPF: pass (google.com: domain of linux-kernel+bounces-180013-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Precedence: bulk
MIME-Version: 1.0
References: <20240515130139.2da899c0@canb.auug.org.au> <20240515135008.GA450088@rocinante>
In-Reply-To: <20240515135008.GA450088@rocinante>
From: Rob Herring <robh@kernel.org>
Date: Wed, 15 May 2024 09:34:47 -0500
Message-ID: <CAL_Jsq+1bYtSm_eTAo9q+ZS3ZzODbnkiCRNa6tOLU5HPUfny8g@mail.gmail.com>
Subject: Re: linux-next: duplicate patches in the devicetree tree
To: =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= <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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, May 15, 2024 at 8:50=E2=80=AFAM Krzysztof Wilczy=C5=84ski <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 'on=
eOf' 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 'on=
eOf' 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