linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: Heiner Kallweit <hkallweit1@gmail.com>
Cc: "Bjorn Helgaas" <bhelgaas@google.com>,
	"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
	"Krzysztof Wilczyński" <kw@linux.com>
Subject: Re: Conflicting commits changing VPD sysfs attribute to static
Date: Wed, 28 Apr 2021 15:44:51 -0500	[thread overview]
Message-ID: <20210428204451.GA426926@bjorn-Precision-5520> (raw)
In-Reply-To: <96350860-b9d2-b278-860a-a0e886723b3a@gmail.com>

On Wed, Apr 28, 2021 at 08:31:28AM +0200, Heiner Kallweit wrote:
> 85725825c10a ("PCI/sysfs: Convert "vpd" to static attribute") duplicates
> what 1e3b0fb5e4d1 ("PCI/VPD: Convert sysfs file to static attribute") did
> already. So this will conflict once you merge pci/sysfs.

Thanks for the heads-up.  I tried to meld 1e3b0fb5e4d1 and
85725825c10a together and put the result on pci/sysfs along with the
other static attribute changes.  Let me know if you see anything I
messed up.

Bjorn

      reply	other threads:[~2021-04-28 20:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-28  6:31 Conflicting commits changing VPD sysfs attribute to static Heiner Kallweit
2021-04-28 20:44 ` Bjorn Helgaas [this message]

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=20210428204451.GA426926@bjorn-Precision-5520 \
    --to=helgaas@kernel.org \
    --cc=bhelgaas@google.com \
    --cc=hkallweit1@gmail.com \
    --cc=kw@linux.com \
    --cc=linux-pci@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).