public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: <dan.j.williams@intel.com>
To: Mark Brown <broonie@kernel.org>, Ingo Molnar <mingo@kernel.org>
Cc: Dave Jiang <dave.jiang@intel.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>
Subject: Re: linux-next: manual merge of the cxl tree with the tip tree
Date: Mon, 26 Jan 2026 21:57:12 -0800	[thread overview]
Message-ID: <697853b8ea075_1d3310066@dwillia2-mobl4.notmuch> (raw)
In-Reply-To: <aXfvyADHrlh2BWxJ@sirena.org.uk>

Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the cxl tree got a conflict in:
> 
>   arch/x86/kernel/e820.c
> 
> between commits:
> 
>   44f732f3ec827 ("x86/boot/e820: Clean up confusing and self-contradictory verbiage around E820 related resource allocations")
>   dc043d6463bf5 ("x86/boot/e820: Standardize e820 table index variable names under 'idx'")
> 
> from the tip tree and commit:
> 
>   bc62f5b308cbd ("dax/hmem, e820, resource: Defer Soft Reserved insertion until hmem is ready")
> 
> from the cxl tree.

Thanks for the fixup, Mark! Looks good.

Ingo, you were not copied on the thread where this originated:

http://lore.kernel.org/69443f707b025_1cee10022@dwillia2-mobl4.notmuch

Boris had some involvement on an earlier version of this, but so far no
one from the tip tree has acked this follow-up.

Please let Dave and I know if you have any concerns. We have it in -next
for soaking and testing, but happy to reroute if needed.

      reply	other threads:[~2026-01-27  5:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-26 22:50 linux-next: manual merge of the cxl tree with the tip tree Mark Brown
2026-01-27  5:57 ` dan.j.williams [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=697853b8ea075_1d3310066@dwillia2-mobl4.notmuch \
    --to=dan.j.williams@intel.com \
    --cc=Smita.KoralahalliChannabasappa@amd.com \
    --cc=broonie@kernel.org \
    --cc=dave.jiang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@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