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

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]

Message-ID: <20210908022620.GA845134@bjorn-Precision-5520>
Date:   Tue, 7 Sep 2021 21:26:20 -0500
From:   Bjorn Helgaas <helgaas@...nel.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     David Miller <davem@...emloft.net>,
        Linux PCI <linux-pci@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Lorenzo Pieralisi <lorenzo.pieralisi@....com>
Subject: Re: [GIT PULL] PCI changes for v5.15

On Tue, Sep 07, 2021 at 07:08:42PM -0700, Linus Torvalds wrote:
> On Tue, Sep 7, 2021 at 2:39 PM Bjorn Helgaas <helgaas@...nel.org> wrote:
> >
> >   drivers/net/ethernet/broadcom/bnxt/bnxt.c
> >   drivers/net/ethernet/broadcom/bnx2.c
> >     Fallout from the VPD changes below.  These include both PCI core and
> >     driver changes, and the driver changes got merged via the net tree and
> >     then reverted so everything would be merged via the PCI tree.
> 
> Christ.
> 
> So the revert from the networking tree has basically _zero_ useful
> information. It just says "revert".

Sorry about that.  I intended to push my test merge in case you wanted
to see my resolution, but I forgot.  I just pushed it ("v5.15-merge"),
but I'm guessing you've already come up with the same resolution.

I was a little mystified about why there was a conflict at all, since
I expected those patches to apply cleanly on top of the revert, and I
should have investigated that more instead of just chalking it up to
my lack of git-fu.

Bjorn