From: Dan Williams <dan.j.williams@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Dan Williams <dan.j.williams@intel.com>
Cc: Ard Biesheuvel <ardb@kernel.org>, Ira Weiny <ira.weiny@intel.com>,
"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-fixes tree with Linus' tree
Date: Sun, 18 Feb 2024 15:00:46 -0800 [thread overview]
Message-ID: <65d28c1efccb_5c7629431@dwillia2-mobl3.amr.corp.intel.com.notmuch> (raw)
In-Reply-To: <20240219090743.1019a5f8@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the cxl-fixes tree got a conflict in:
>
> drivers/acpi/apei/ghes.c
>
> between commit:
>
> 54ce1927eb78 ("cxl/cper: Fix errant CPER prints for CXL events")
>
> from Linus' tree and commit:
>
> 6cb604ed24a1 ("acpi/ghes: Remove CXL CPER notifications")
>
> from the cxl-fixes tree.
>
> I fixed it up (I reverted the former commit before merging this tree) 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.
Sorry about that Stephen, I had not realized that fix already went up
through Ard. I have rebased the removal patch on v6.8-rc4.
next prev parent reply other threads:[~2024-02-18 23:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-18 22:07 linux-next: manual merge of the cxl-fixes tree with Linus' tree Stephen Rothwell
2024-02-18 23:00 ` Dan Williams [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-25 22:04 Stephen Rothwell
2024-02-26 23:01 ` Dan Williams
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=65d28c1efccb_5c7629431@dwillia2-mobl3.amr.corp.intel.com.notmuch \
--to=dan.j.williams@intel.com \
--cc=ardb@kernel.org \
--cc=ira.weiny@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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