2021-02-24 19:24:55

by Linus Torvalds

[permalink] [raw]
Subject: Re: [GIT PULL] PCI changes for v5.12

On Wed, Feb 24, 2021 at 11:03 AM Bjorn Helgaas <[email protected]> wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git tags/pci-v5.12-changes

I pulled this, but I'm now unpulling it again.

Why are many of those commits only two hours old, and most of the rest
is from yesterday?

Has any of this been in linux-next?

And if it has, then why was it rebased, and why didn't you explain
*why* it was rebased if so?

I'm willing to pull this if it turns out it _has_ been in linux-next,
but I need explanations.

Linus


2021-02-25 03:34:55

by Bjorn Helgaas

[permalink] [raw]
Subject: Re: [GIT PULL] PCI changes for v5.12

On Wed, Feb 24, 2021 at 11:21:44AM -0800, Linus Torvalds wrote:
> On Wed, Feb 24, 2021 at 11:03 AM Bjorn Helgaas <[email protected]> wrote:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git tags/pci-v5.12-changes
>
> I pulled this, but I'm now unpulling it again.
>
> Why are many of those commits only two hours old, and most of the rest
> is from yesterday?
>
> Has any of this been in linux-next?

Sorry about the mess. This has been in linux-next. Most of the
recent commit dates are from typos I fixed in commit logs and
documentation patches. A few are because I also sorted a few patches
onto different topic branches.

Here's a little history of the pci/next branch from linux-next and
from my pull request:

next-20210222: pci/next 84c8d3d0b60e
next-20210223: pci/next 4cb431e82c25
$ git diff 84c8d3d0b60e 4cb431e82c25
- fix documentation and comment typos, whitespace issues
- add fc235fcb0f7c ("PCI: acpiphp: Remove unused acpiphp_callback typedef")
- add f8ee579d53ac ("PCI: pci-bridge-emul: Fix array overruns, improve safety")
- add f6bda644fa3a ("PCI: Fix pci_register_io_range() memory leak")
- add d2bb2f9e1af6 ("PCI/ASPM: Move LTR, ASPM L1SS save/restore into PCIe save/restore")
- add e34a4f0b7001 ("PCI/ASPM: Move LTR save/restore state functions earlier")

next-20210224: pci/next 6039bd61b69f
$ git diff 4cb431e82c25 6039bd61b69f
- drop d2bb2f9e1af6 ("PCI/ASPM: Move LTR, ASPM L1SS save/restore into PCIe save/restore")
- drop e34a4f0b7001 ("PCI/ASPM: Move LTR save/restore state functions earlier")
- dropped these cosmetic changes

pci-v5.12-changes: 2bd36c391515
$ git diff 6039bd61b69f 2bd36c391515
<empty>
- no content changes; changed commit logs and moved patches
between topic branches

pci-v5.12-changes: e18fb64b7986 (updated)
$ git diff 2bd36c391515 e18fb64b7986
<empty>
- no content changes; added Signed-off-by for patches moved to
topic branch

I'll send you a new pull request because I forgot to add my sign-off
on a couple patches I had moved to a topic branch.

Sorry again.

Bjorn