linux-kernel - Re: [GIT PULL] PCI changes for v5.8

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 6 Jun 2020 11:09:26 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Bjorn Helgaas <helgaas@...nel.org>, Rob Herring <robh@...nel.org>
Cc:     linux-pci@...r.kernel.org,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
        Kishon Vijay Abraham I <kishon@...com>
Subject: Re: [GIT PULL] PCI changes for v5.8

On Fri, Jun 5, 2020 at 1:23 PM Bjorn Helgaas <helgaas@...nel.org> wrote:
>
> You should see two conflicts:
>
>   2) Documentation/devicetree/bindings/pci/cdns-pcie.yaml: conflict
>   between Rob's 3d21a4609335 ("dt-bindings: Remove cases of 'allOf'
>   containing a '$ref'") and Kishon's fb5f8f3ca5f8 ("dt-bindings: PCI:
>   cadence: Deprecate inbound/outbound specific bindings").
>
>   Kishon moved a hunk from cdns-pcie.yaml to cdns-pcie-ep.yaml and
>   cdns-pcie-host.yaml, so I think the new homes need Rob's change:
>
>     Documentation/devicetree/bindings/pci/cdns-pcie-ep.yaml
>     Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml

I decided not to touch those two files, because the AllOf rules seem
strange, and not all were updated anyway, so I'm going to leave it to
others (ie Rob) to decide how they want to handle it.

I suspect your resolution is correct, but I also suspect it doesn't
_matter_, and since I don't understand the yaml rules I'll leave it
alone.

Rob?

              Linus