From: "Uwe Kleine-König (The Capable Hub)" <u.kleine-koenig@baylibre.com>
To: Borislav Petkov <bp@alien8.de>
Cc: Tony Luck <tony.luck@intel.com>,
Mark Gross <markgross@kernel.org>,
"Arvind R." <arvino55@gmail.com>,
Jason Baron <jbaron@akamai.com>,
Qiuxu Zhuo <qiuxu.zhuo@intel.com>,
linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org,
Markus Schneider-Pargmann <msp@baylibre.com>
Subject: Re: [PATCH v2] edac: Consistently define pci_device_ids using named initializers
Date: Thu, 28 May 2026 10:18:33 +0200 [thread overview]
Message-ID: <ahf3QmE-oWP6CWrw@monoceros> (raw)
In-Reply-To: <20260528040038.GFahe95n8sFjjEsj1V@fat_crate.local>
[-- Attachment #1: Type: text/plain, Size: 1002 bytes --]
Hello Boris,
On Wed, May 27, 2026 at 09:00:38PM -0700, Borislav Petkov wrote:
> On Wed, May 27, 2026 at 08:10:56AM +0200, Uwe Kleine-König (The Capable Hub) wrote:
> > Borislav Petkov asked me to do a patch for drivers/edac/igen6_edac.c
> > only on top of next, but I hope this way it's still easier.
>
> There was a reason why I wanted you to separate the igen6 changes - that
> driver is getting regular updates seemingly daily currently and that patch of
> yours doesn't apply again.
If this conflict is in drivers/edac/igen6_edac.c, a patch for only this
driver would have aged in the same way and conflict, too? My thought was
that it's easy to split out just the changes for
drivers/edac/igen6_edac.c from a complete v2 patch if you only want
these changes, and that a complete v2 allows to create a git history
that is a tad prettier.
Sorry if that created more efforts for you.
> Anyway, I fixed up the conflicts. See below.
Looks right to me.
Best regards
Uwe
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2026-05-28 8:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-27 6:10 Uwe Kleine-König (The Capable Hub)
2026-05-27 14:57 ` Zhuo, Qiuxu
2026-05-28 4:00 ` Borislav Petkov
2026-05-28 8:18 ` Uwe Kleine-König (The Capable Hub) [this message]
2026-05-28 14:52 ` Borislav Petkov
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=ahf3QmE-oWP6CWrw@monoceros \
--to=u.kleine-koenig@baylibre.com \
--cc=arvino55@gmail.com \
--cc=bp@alien8.de \
--cc=jbaron@akamai.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=msp@baylibre.com \
--cc=qiuxu.zhuo@intel.com \
--cc=tony.luck@intel.com \
/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
all inboxes | Powered by JetHome®