All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Thierry Reding <thierry.reding@kernel.org>
Cc: Boris Brezillon <boris.brezillon@collabora.com>,
	 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 nand tree with the mtd-fixes/mtd/fixes tree
Date: Wed, 29 Apr 2026 19:12:31 +0200	[thread overview]
Message-ID: <87a4uld728.fsf@bootlin.com> (raw)
In-Reply-To: <20260429100717.3982889-1-thierry.reding@kernel.org> (Thierry Reding's message of "Wed, 29 Apr 2026 12:07:16 +0200")

Hi Thierry,

On 29/04/2026 at 12:07:16 +02, Thierry Reding <thierry.reding@kernel.org> wrote:

> Hi all,
>
> Today's linux-next merge of the nand tree got a conflict in:
>
>   drivers/mtd/nand/spi/winbond.c
>
> between commit:
>
>   8d655748aba1 ("mtd: spinand: winbond: Set the packed page read flag to W35N02/04JW")
>
> from the mtd-fixes/mtd/fixes tree and commits:
>
>   9980ff0d528f ("mtd: spinand: winbond: Add support for continuous reads on W35NxxJW")
>   a211bd1ecc0b ("mtd: spinand: winbond: Ensure chips are ordered by density")

I forgot this would obviously break linux-next. I've rebased -next on
top of -fixes for now, I will include the -rc that receives these
patches later. Merge should be smooth tomorrow.

Thanks,
Miquèl

      reply	other threads:[~2026-04-29 17:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-29 10:07 linux-next: manual merge of the nand tree with the mtd-fixes/mtd/fixes tree Thierry Reding
2026-04-29 17:12 ` Miquel Raynal [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=87a4uld728.fsf@bootlin.com \
    --to=miquel.raynal@bootlin.com \
    --cc=boris.brezillon@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=thierry.reding@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.