[PULL] mtd: nand: Changes for 4.11

[Brian Norris]

On Tue, Feb 07, 2017 at 10:46:21AM +0100, Marek Vasut wrote:
> On 02/07/2017 10:09 AM, Boris Brezillon wrote:
> > Hi Brian,
> > 
> > Here is a rather small PR for 4.11. No fancy things in this release, and
> > not even a single new driver (which is completely my fault since I failed
> > to review the Arasan driver in time :-().
> > 
> > As usual, let me know if I did something wrong.
> > 
> > Marek, Richard, Cyrille, don't hesitate to point any patches I may have
> > missed.
> 
> >From my side, the PR looks fine. If I find something missing, I will
> yell. Thanks
> 
> > Thanks,
> > 
> > Boris
> > 
> > The following changes since commit 566cf877a1fcb6d6dc0126b076aad062054c2637:
> > 
> >   Linux 4.10-rc6 (2017-01-29 14:25:17 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git at github.com:linux-nand/linux.git tags/nand/for-4.11
> > 
> > for you to fetch changes up to a4077ce5871304f8a78f80b74b18b6052a410f1a:
> > 
> >   mtd: nand: Add Winbond manufacturer id (2017-02-06 11:42:43 +0100)
> > 
> > ----------------------------------------------------------------
> > This pull request contains minor fixes/improvements on existing drivers:
> > - sunxi: avoid busy-waiting for NAND events
> > - ifc: fix ECC handling on IFC v1.0
> > - OX820: add explicit dependency on ARCH_OXNAS in Kconfig
> > - core: add a new manufacture ID and fix a kernel-doc warning
> > - fsmc: kill pdata support
> > - lpc32xx_slc: remove unneeded NULL check
> > 
> > ----------------------------------------------------------------

Pulled into l2-mtd.git. Thanks!

There was a trivial conflict in nand.h, in the kerneldoc, due to
recently-applied changes.

Brian