From: Jason Gunthorpe <jgg@nvidia•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Dan Williams <dan.j.williams@intel•com>,
Dave Jiang <dave.jiang@intel•com>,
Davidlohr Bueso <dave@stgolabs•net>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the cxl tree with the hmm tree
Date: Fri, 7 Mar 2025 08:16:06 -0400 [thread overview]
Message-ID: <20250307121606.GJ354511@nvidia.com> (raw)
In-Reply-To: <20250307191448.36be9934@canb.auug.org.au>
On Fri, Mar 07, 2025 at 07:14:48PM +1100, Stephen Rothwell wrote:
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Thanks, it looks right
Jason
prev parent reply other threads:[~2025-03-07 12:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-07 8:14 linux-next: manual merge of the cxl tree with the hmm tree Stephen Rothwell
2025-03-07 12:16 ` Jason Gunthorpe [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=20250307121606.GJ354511@nvidia.com \
--to=jgg@nvidia$(echo .)com \
--cc=dan.j.williams@intel$(echo .)com \
--cc=dave.jiang@intel$(echo .)com \
--cc=dave@stgolabs$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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