From: Niklas Cassel <cassel@kernel.org>
To: bhelgaas@google.com, kw@linux.com
Cc: linux-pci@vger.kernel.org, shuah@kernel.org,
linux-kselftest@vger.kernel.org,
manivannan.sadhasivam@linaro.org
Subject: Re: [PATCH 1/2] misc: pci_endpoint_test: Give disabled BARs a distinct error code
Date: Mon, 27 Jan 2025 17:31:38 +0100 [thread overview]
Message-ID: <Z5e06sgIp3DI8viG@ryzen> (raw)
In-Reply-To: <20250123120147.3603409-3-cassel@kernel.org>
On Thu, Jan 23, 2025 at 01:01:48PM +0100, Niklas Cassel wrote:
> ---
> Hello PCI maintainers.
> This patch might give a trivial conflict with:
> https://lore.kernel.org/linux-pci/20250123095906.3578241-2-cassel@kernel.org/T/#u
> because the context lines (lines that haven't been changed)
> might be different. If there is a conflict, simply look at
> this patch by itself, and resolution should be trivial.
Note to PCI maintainers:
As mentioned in the comment section of this patch,
this patch has a trivial conflict with:
https://lore.kernel.org/linux-pci/20250123095906.3578241-2-cassel@kernel.org/T/#u
I noticed that git still manages to apply this patch correctly if applying
this patch using:
$ git am -3
Kind regards,
Niklas
next prev parent reply other threads:[~2025-01-27 16:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-23 12:01 [PATCH 1/2] misc: pci_endpoint_test: Give disabled BARs a distinct error code Niklas Cassel
2025-01-23 12:01 ` [PATCH 2/2] selftests: pci_endpoint: Skip disabled BARs Niklas Cassel
2025-02-03 16:49 ` Manivannan Sadhasivam
2025-02-14 17:45 ` Manivannan Sadhasivam
2025-01-27 16:31 ` Niklas Cassel [this message]
2025-02-03 16:46 ` [PATCH 1/2] misc: pci_endpoint_test: Give disabled BARs a distinct error code Manivannan Sadhasivam
2025-02-13 13:48 ` Niklas Cassel
2025-02-14 17:44 ` Manivannan Sadhasivam
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=Z5e06sgIp3DI8viG@ryzen \
--to=cassel@kernel.org \
--cc=bhelgaas@google.com \
--cc=kw@linux.com \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=shuah@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 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.