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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 775 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Dan Williams]

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.

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

[Dan Williams]

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.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]