The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Mark Brown <broonie@kernel.org>
Cc: Richard Weinberger <richard.weinberger@gmail.com>,
	 Kees Cook <kees@kernel.org>,
	 Kees Cook <kees+treewide@kernel.org>,
	 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	 Linux Next Mailing List <linux-next@vger.kernel.org>,
	 Simon Wunderlich <sw@simonwunderlich.de>
Subject: Re: linux-next: manual merge of the mtd tree with the origin tree
Date: Wed, 18 Nov 2026 17:02:24 +0100	[thread overview]
Message-ID: <877biagmb3.fsf@bootlin.com> (raw)
In-Reply-To: <av24MbMORkbY00UX@sirena.org.uk> (Mark Brown's message of "Wed, 18 Nov 2026 14:37:37 +0000")

On 18/11/2026 at 14:37:37 GMT, Mark Brown <broonie@kernel.org> wrote:

> Hi all,
>
> Today's linux-next merge of the mtd tree got a conflict in:
>
>   drivers/mtd/maps/lantiq-flash.c
>
> between commit:
>
>   4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
>
> from the origin tree and commit:
>
>   fd1cc5b1dc4f2 ("mtd: maps: lantiq-flash: fix NULL pointer dereference on probe")
>
> from the mtd tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Mmmh, I discover this mess only now. I rebased my branches on top of
-rc2 and fixed the conflict so your fix should not longer be
necessary. I hope you told Linus how painful it was for everybody to
handle such late introduction :)

Thanks for the heads up,
Miquèl

  reply	other threads:[~2026-11-18 16:02 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18 14:37 linux-next: manual merge of the mtd tree with the origin tree Mark Brown
2026-11-18 16:02 ` Miquel Raynal [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-01-22 15:31 Mark Brown
2026-01-22 15:42 ` Miquel Raynal

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=877biagmb3.fsf@bootlin.com \
    --to=miquel.raynal@bootlin.com \
    --cc=broonie@kernel.org \
    --cc=kees+treewide@kernel.org \
    --cc=kees@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=richard.weinberger@gmail.com \
    --cc=sw@simonwunderlich.de \
    /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