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