Release v2019.06.1 ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

startup: execute /env/bin/init as part of the initial shell ...

Commit 90df2a955e3c ("defaultenv: Convert init script to C")
unintentionally changed the way the legacy "/env/bin/init" script is
run, so that it runs in a sub-shell context, effectively changing
`run_command("source /env/bin/init");` to
`run_command("/env/bin/init");`.  Therefore, any changes to shell
environment variables made by the script are undone when the script
exits.  This patch reverts back to the old behavior.

Fixes: 90df2a955e3c ("defaultenv: Convert init script to C")
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

startup: Do not overwrite global.linux.bootargs.console ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Release v2019.06.0 ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

lib: select BASE64 if BLOBGEN is selected ...

Blobgen requires the BASE64 libraries, select them to provide them if
BLOBGEN is selected.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Documentation: imx8mq-evk: collapse BMOD switch superposition ...

Table 3. Boot mode setting in the user's guide[1] lists
0010 as 'Boot from EMMC'. Adjust diagram accordingly.

[1]: https://www.mouser.com/ds/2/302/IMX8MDQLQEVKHUG-1280333.pdf

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: boards: kindle mx50: adapt MCI name to DTS ...

The MCI instances got aliases in the DTS from linux upstream which changed
the eMMC devicename e.g. from disk0 to mmc2. Adapt to this.

Signed-off-by: Alexander Kurz <akurz@blala.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: include: dma: Zero out DMA coherent memory in no-MMU case ...

Add code to match the behavior of dma_alloc_coherent() when CONFIG_MMU
is selected.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

LICENSES: remove empty other, exceptions directories ...

These directories were originally added as they were required for
spdxcheck.py, which upstream checkpatch.pl invokes.

As git doesn't index empty directories, they contained empty
.gitignore files. As these files were 0 bytes, make distclean now
removes them.

We already patch checkpatch.pl, so we will just patch spdxcheck.py
when we add it and get rid of these directories.
They can be added back should the need arise.

Reported-by: Geordan Neukum <gneukum1@gmail.com>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

commands: spi: fix NULL pointer dereference ...

The renaming of "master" to "controller" done in
    812a9dd
    spi: Generalize SPI "master" to "controller"

breaks the spi command, because the spi.master pointer is not assigned.
The pointer is kept for backwards compatability.

Assign it, so that spi drivers that are still using "spi->master" can be
used.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

serdev: Do not call .receive_buf() callback recursively ...

Code implementing .receive_buf() callback can potentially call
serdev_device_write(), which will call serdev_device_poller(). We need
to make sure that such a call is a no-op in order to prevent
corrupting shared data buffer as well as breaking .receive_buf
callback that most likely does not expect that to happen.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Tested-by: Cory Tusar <cory.tusar@zii.aero>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

spi: Kconfig: remove dependency list from Freescale QSPI controller ...

The dependency list for the Freescale QSPI controller doesn't match
the SoCs the hardware is in at all. Remove the dependency entirely as
the driver builds on all machines.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/ubifs'

Merge branch 'for-next/qspi'

Merge branch 'for-next/ppc'

Merge branch 'for-next/mvebu'

Merge branch 'for-next/mmc'

Merge branch 'for-next/misc'

Merge branch 'for-next/mips'

Merge branch 'for-next/layerscape'

Merge branch 'for-next/imx'

Merge branch 'for-next/dts'

Merge branch 'for-next/ctrlc'

Merge branch 'for-next/blobgen'

Merge branch 'for-next/arm'

dts: update to v5.1 ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

dts: update to v5.1-rc7 ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

dts: update to v5.1-rc6 ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

dts: update to v5.1-rc4 ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Release v2019.05.0 ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>