linux-kernel - Re: linux-next: manual merge of the cxl-fixes tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <65dd185d2eba8_2bca029498@dwillia2-mobl3.amr.corp.intel.com.notmuch>
Date: Mon, 26 Feb 2024 15:01:49 -0800
From: Dan Williams <dan.j.williams@...el.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Dan Williams
	<dan.j.williams@...el.com>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, "Linux Next
 Mailing List" <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the cxl-fixes tree with Linus' tree

Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the cxl-fixes tree got a conflict in:
> 
>   drivers/cxl/acpi.c
> 
> between commit:
> 
>   5c6224bfabbf ("cxl/acpi: Fix load failures due to single window creation failure")
> 
> from Linus' tree and commit:
> 
>   5141fa1ec23f ("cxl/acpi: Fix load failures due to single window creation failure")
> 
> from the cxl-fixes tree.
> 
> I fixed it up (I just used the version from Linus' 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.

Thanks, Steven. Will drop that out of the fixes branch. I ended up with
a late refresh of what was included in the tagged pull vs what was
soaking in linux-next.