All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jarkko Sakkinen <jarkko@kernel.org>
To: Mark Brown <broonie@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: Re: linux-next: manual merge of the tpmdd-keys tree with the mm-fixes,rxarray tree
Date: Mon, 16 Nov 2026 21:46:01 +0200	[thread overview]
Message-ID: <avtdedZFfQQXbm9f@kernel.org> (raw)
In-Reply-To: <avtYu0Ze50s_CtFu@sirena.org.uk>

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

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

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

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=avtdedZFfQQXbm9f@kernel.org \
    --to=jarkko@kernel.org \
    --cc=4ncienth@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=broonie@kernel.org \
    --cc=da.gomez@samsung.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.