Linux-Next discussions
 help / color / mirror / Atom feed
* linux-next: manual merge of the tpmdd-keys tree with the mm-fixes,rxarray tree
@ 2026-11-16 19:25 Mark Brown
  2026-11-16 19:46 ` Jarkko Sakkinen
  0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2026-11-16 19:25 UTC (permalink / raw)
  To: Jarkko Sakkinen
  Cc: Andrew Morton, Daehyeon Ko, Daniel Gomez, Mike Rapoport,
	Vlastimil Babka, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

Today's linux-next merge of the tpmdd-keys tree got a conflict in:

  lib/Kconfig

between commits:

  37ff457ec4679 ("assoc_array: discard shortcut when collapsing a leaf-only node")
  29f1617aa1dbd ("rust: rxarray: add rust xarray support")

from the mm-fixes,rxarray tree and commit:

  1dbbde3bc4b80 ("lib: Remove assoc_array")

from the tpmdd-keys tree.

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.

diff --cc lib/Kconfig
index 001ee3c064a5f,f70382dbb1595..0000000000000
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -349,31 -349,6 +349,17 @@@ config XARRAY_MULT
  	  Support entries which occupy multiple consecutive indices in the
  	  XArray.
  
 +config XARRAY_RUST
 +	bool "Rust XArray (EXPERIMENTAL)"
 +	depends on RUST
 +	depends on EXPERT
 +	help
 +	  This builds the Rust implementation of the XArray (kernel::rxarray).
 +	  It is an experimental reference implementation under evaluation and does
 +	  not yet cover every feature of the C XArray.
 +
 +	  If unsure, say N.
 +
- config ASSOCIATIVE_ARRAY
- 	bool
- 	help
- 	  Generic associative array.  Can be searched and iterated over whilst
- 	  it is being modified.  It is also reasonably quick to search and
- 	  modify.  The algorithms are non-recursive, and the trees are highly
- 	  capacious.
- 
- 	  See:
- 
- 		Documentation/core-api/assoc_array.rst
- 
- 	  for more information.
- 
  config CLOSURES
  	bool
  

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the tpmdd-keys tree with the mm-fixes,rxarray tree
  2026-11-16 19:25 linux-next: manual merge of the tpmdd-keys tree with the mm-fixes,rxarray tree Mark Brown
@ 2026-11-16 19:46 ` Jarkko Sakkinen
  0 siblings, 0 replies; 2+ messages in thread
From: Jarkko Sakkinen @ 2026-11-16 19:46 UTC (permalink / raw)
  To: Mark Brown
  Cc: Andrew Morton, Daehyeon Ko, Daniel Gomez, Mike Rapoport,
	Vlastimil Babka, Linux Kernel Mailing List,
	Linux Next Mailing List

On Mon, Nov 16, 2026 at 07:25:47PM +0000, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the tpmdd-keys tree got a conflict in:
> 
>   lib/Kconfig
> 
> between commits:
> 
>   37ff457ec4679 ("assoc_array: discard shortcut when collapsing a leaf-only node")
>   29f1617aa1dbd ("rust: rxarray: add rust xarray support")
> 
> from the mm-fixes,rxarray tree and commit:
> 
>   1dbbde3bc4b80 ("lib: Remove assoc_array")
> 
> from the tpmdd-keys tree.
> 
> 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, I'll resolve this.

Br, Jarkko

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-16 19:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 19:25 linux-next: manual merge of the tpmdd-keys tree with the mm-fixes,rxarray tree Mark Brown
2026-11-16 19:46 ` Jarkko Sakkinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox