mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Jarkko Sakkinen <jarkko@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Daehyeon Ko <4ncienth@gmail.com>,
	Daniel Gomez <da.gomez@samsung.com>,
	Mike Rapoport <rppt@kernel.org>,
	Vlastimil Babka <vbabka@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the tpmdd-keys tree with the mm-fixes,rxarray tree
Date: Mon, 16 Nov 2026 19:25:47 +0000	[thread overview]
Message-ID: <avtYu0Ze50s_CtFu@sirena.org.uk> (raw)

[-- 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 --]

             reply	other threads:[~2026-11-16 19:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 19:25 Mark Brown [this message]
2026-11-16 19:46 ` Jarkko Sakkinen

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=avtYu0Ze50s_CtFu@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=4ncienth@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=da.gomez@samsung.com \
    --cc=jarkko@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rppt@kernel.org \
    --cc=vbabka@kernel.org \
    /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

all inboxes | Powered by JetHome®