linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Richard Weinberger <richard.weinberger@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Boris Brezillon <boris.brezillon@collabora.com>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Richard Weinberger <richard@nod.at>
Subject: Re: linux-next: build failure after merge of the mtd-fixes tree
Date: Mon, 18 May 2020 09:45:19 +0200	[thread overview]
Message-ID: <20200518094519.1e15d108@xps13> (raw)
In-Reply-To: <CAFLxGvy-MytQLhrju0cBaC5rz-80XA29R4EU_eh9LC670h2H5w@mail.gmail.com>

Hi Richard,

Richard Weinberger <richard.weinberger@gmail.com> wrote on Mon, 18 May
2020 01:02:54 +0200:

> On Mon, May 18, 2020 at 12:41 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > After merging the mtd-fixes tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > /home/sfr/next/next/drivers/mtd/nand/spi/core.c: In function 'spinand_init':
> > /home/sfr/next/next/drivers/mtd/nand/spi/core.c:1093:26: error: 'struct nand_device' has no member named 'ecc'
> >  1093 |  mtd->ecc_strength = nand->ecc.ctx.conf.strength;
> >       |                          ^~
> > /home/sfr/next/next/drivers/mtd/nand/spi/core.c:1094:27: error: 'struct nand_device' has no member named 'ecc'
> >  1094 |  mtd->ecc_step_size = nand->ecc.ctx.conf.step_size;
> >       |                           ^~
> >
> > Caused by commit
> >
> >   d5baa0ec83de ("mtd: spinand: Propagate ECC information to the MTD structure")
> >
> > "This fix depends on recent changes and should not be backported as-is." ?  
> 
> Urgh, yes.
> This patch slipped in.
> 
> Anyway, Miquel, the ready-to-backport diff would be this?
> 
> diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c
> index 248c4d7a0cf4..e2c382ffc5b6 100644
> --- a/drivers/mtd/nand/spi/core.c
> +++ b/drivers/mtd/nand/spi/core.c
> @@ -1090,8 +1090,8 @@ static int spinand_init(struct spinand_device *spinand)
>         mtd->oobavail = ret;
> 
>         /* Propagate ECC information to mtd_info */
> -       mtd->ecc_strength = nand->ecc.ctx.conf.strength;
> -       mtd->ecc_step_size = nand->ecc.ctx.conf.step_size;
> +       mtd->ecc_strength = nand->eccreq.strength;
> +       mtd->ecc_step_size = nand->eccreq.step_size;

Indeed, sorry for the confusion, this is fine.

Thanks,
Miquèl

      reply	other threads:[~2020-05-18  7:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-17 22:40 linux-next: build failure after merge of the mtd-fixes tree Stephen Rothwell
2020-05-17 23:02 ` Richard Weinberger
2020-05-18  7:45   ` 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=20200518094519.1e15d108@xps13 \
    --to=miquel.raynal@bootlin.com \
    --cc=boris.brezillon@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=richard.weinberger@gmail.com \
    --cc=richard@nod.at \
    --cc=sfr@canb.auug.org.au \
    /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;
as well as URLs for NNTP newsgroup(s).