All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David Miller <davem@davemloft.net>,
	Linux PCI <linux-pci@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: Re: [GIT PULL] PCI changes for v5.15
Date: Tue, 7 Sep 2021 21:26:20 -0500	[thread overview]
Message-ID: <20210908022620.GA845134@bjorn-Precision-5520> (raw)
In-Reply-To: <CAHk-=wiCgh_V-g74LE4pQKqakbiK+CM5opVtH1t2+Y3R=uH9EA@mail.gmail.com>

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@kernel.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

  reply	other threads:[~2021-09-08  2:26 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-07 21:39 [GIT PULL] PCI changes for v5.15 Bjorn Helgaas
2021-09-08  2:08 ` Linus Torvalds
2021-09-08  2:26   ` Bjorn Helgaas [this message]
2021-09-08  2:52     ` Linus Torvalds
2021-09-08  2:25 ` pr-tracker-bot

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=20210908022620.GA845134@bjorn-Precision-5520 \
    --to=helgaas@kernel.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=torvalds@linux-foundation.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.