Merge tag 'samsung-defconfig-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Pull "ARM defconfig cleanup" from Krzysztof Kozłowski:

1. Remove old Kconfig options from all ARM configs,
2. Update Samsung defconfigs to bring back options over time got disabled
   for some reason (configs were not updated along with the code),
3. Save defconfigs for Samsung.

* tag 'samsung-defconfig-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: tct_hammer_defconfig: Save defconfig
  ARM: s5pv210_defconfig: Save defconfig
  ARM: s3c6400_defconfig: Save defconfig
  ARM: mini2440_defconfig: Save defconfig
  ARM: s3c2410_defconfig: Save defconfig
  ARM: exynos_defconfig: Save defconfig
  ARM: s5pv210_defconfig: Bring back lost (but wanted) options
  ARM: s3c6400_defconfig: Bring back lost (but wanted) options
  ARM: s3c2410_defconfig: Bring back lost (but wanted) options
  ARM: tct_hammer_defconfig: Bring back lost (but wanted) options
  ARM: mini2440_defconfig: Bring back lost (but wanted) options
  ARM: defconfig: samsung: Re-order entries to match savedefconfig
  ARM: defconfig: Cleanup from old Kconfig options

Merge tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

The i.MX defconfig updates for 4.13:
 - Enable i.MX7 ADC driver support.
 - Enable THERMAL_WRITABLE_TRIPS, so that i.MX thermal driver can set
   trip points for testing.
 - CONFIG_DEBUG_FS gets lost by accident because of a change around
   CONFIG_RCU_TRACE.  Re-enable it explicitly.
 - Enable MXS LRADC driver and CONFIG_CGROUPS for mxs_defconfig.
 - Enable more common cpufreq governors to help test cpufreq driver.

* tag 'imx-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select CONFIG_IMX7D_ADC
  ARM: imx_v6_v7_defconfig: Set THERMAL_WRITABLE_TRIPS=y for testing
  ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS
  ARM: mxs_defconfig: Re-enable MXS LRADC
  ARM: mxs_defconfig: Enable CONFIG_CGROUPS
  ARM: imx_v6_v7_defconfig: Enable cpufreq governors
Signed-off-by: Olof Johansson <olof@lixom.net>

mvebu defconfig for 4.13

Enable the SENSORS_PWM_FAN in mvebu_v7_defconfig support by gpio
driver since the previous release

* tag 'mvebu-defconfig-4.13-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Enable SENSORS_PWM_FAN in defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'at91-ab-4.13-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig

defconfig for 4.13:

 - Switch sama5 to be tickless in idle and enable hrtimer
 - Add MCAN

* tag 'at91-ab-4.13-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: configs: at91: add MCAN driver to sama5_defconfig
  ARM: configs: at91: enable HIGH_RES_TIMERS
  ARM: configs: at91: make system tickless when idle
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'qcom-defconfig-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig

Qualcomm ARM Based defconfig Updates for v4.13

* Enable IPQ4019 clock and pinctrl

* tag 'qcom-defconfig-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: qcom_defconfig: Enable IPQ4019 clock and pinctrl
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'davinci-for-v4.13/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig

Enable mtdtests and USB NCM gadget in DaVinci kernel
(as modules).

* tag 'davinci-for-v4.13/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: enable USB CDC NCM gadget
  ARM: davinci_all_defconfig: enable mtdtests
Signed-off-by: Olof Johansson <olof@lixom.net>

This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.13,
please pull the following:

- Stefan updates the bcm2835_defconfig to include serial, Ethernet and USB
  gadget support which is needed for the Raspberry Pi Zero OTG changes

* tag 'arm-soc/for-4.13/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: bcm2835_defconfig: Enable serial & ethernet USB gadget support
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig

STM32 defconfig updates for v4.13, round 1

Highlights:
----------
 - Enable STMPE1600 IO expander
 - Enable Watchdog support

* tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: configs: stm32: STMPE1600 GPIO expander
  ARM: configs: stm32: Add watchdog support in STM32 defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'samsung-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Samsung defconfig ARM update for v4.13:
1. Enable Exynos PRNG along with user-space crypto API.

* tag 'samsung-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Enable Exynos RNG and user-space crypto API
  ARM: exynos_defconfig: Enable Exynos RNG and user-space crypto API
Signed-off-by: Olof Johansson <olof@lixom.net>

Merge tag 'davinci-for-v4.13/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig

Re-sync of davinci_all_defconfig with savedefconfig and enable
CPPI 4.1 DMA for MUSB, some commonly used USB devices, and
Lego Mindstorms EV3 battery driver.

* tag 'davinci-for-v4.13/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci_all_defconfig: Enable CPPI 4.1 USB OTG DMA
  ARM: davinci_all_defconfig: enable USB audio/video device support
  ARM: davinci_all_defconfig: cleanup with savedefconfig
  ARM: davinci_all_defconfig: enable LEGO MINDSTORMS EV3 battery module
Signed-off-by: Olof Johansson <olof@lixom.net>

Select CONFIG_IMX7D_ADC so that the i.MX7 ADC driver can be
built by default.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

Now that the GPIO driver also supports PWM operation, enable the PWM
framework and fan driver in mvebu_v7_defconfig.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
URL: https://patchwork.ozlabs.org/patch/427297/
[Ralph Sennhauser: add fan driver to defconfig]
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Enable USB CDC NCM gadget module in davinci_all_defconfig
to make it easier to use it on these devices.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

mtdtests module has some useful tests to verify that
mtd drivers like davinci_nand are working correctly.

Enable it in davinci_all_defconfig to make testing and
debug easier.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

Setting trip points is supported by the imx thermal driver and it is
useful to be able to test this without adjusting config.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

This pull request enables USB OTG mode in the Pi 0/1 defconfig.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

In order to use the serial and ethernet USB gadget support on
Raspberry Zero, we also need to enable the PHY driver, kernel module
and OTG support.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Eric Anholt <eric@anholt.net>

Generate new defconfig to get rid of obsolete Kconfig entries:
 - BUGVERBOSE was changed into DEBUG_BUGVERBOSE and will be enabled by
   default (it is useful);
 - DETECT_SOFTLOCKUP was changed into LOCKUP_DETECTOR;
 - rest of entries is being removed by default values;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Generate new defconfig to get rid of obsolete Kconfig entries:
 - S3C_LOWLEVEL_UART_PORT and S3C_DEV_FB are invalid for S5P;
 - S5PV210_SETUP_FB_24BPP is gone;
 - rest of entries is being removed by default values;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Generate new defconfig to get rid of obsolete Kconfig entries:
 - S3C_BOOT_ERROR_RESET, SND_S3C24XX_SOC and SND_SOC_SMDK_WM9713 are
   gone;
 - rest of entries is being removed by default values;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Generate new defconfig to get rid of obsolete Kconfig entries:
 - NET_ETHERNET, SND_S3C24XX_SOC are gone;
 - CRYPTO_FIPS is changed to no (cannot be part of module);
 - BINFMT_AOUT cannot be selected anymore;
 - rest of entries is being removed by default values;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Generate new defconfig to get rid of obsolete Kconfig entries:
 - S3C_BOOT_ERROR_RESET, SMDK2440_CPU2442 are gone;
 - ARM_THUMB is changed to yes (selected by default);
 - BINFMT_AOUT cannot be selected anymore;
 - rest of entries is being removed by default values;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Generate new defconfig to get rid of obsolete Kconfig entries:
 - RFKILL_REGULATOR is gone;
 - COMMON_CLK_MAX77802 was merged into COMMON_CLK_MAX77686;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

The config was not updated for some time so it needs updates to get the
same options as wanted initially:
 - SYSFS_DEPRECATED is now needed for SYSFS_DEPRECATED_V2;
 - DEBUG_SPINLOCK_SLEEP was replaced by DEBUG_ATOMIC_SLEEP;
 - Use proper DEBUG_S3C_UART1 for UART1;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

The config was not updated for some time so it needs updates to get the
same options as wanted initially:
 - SYSFS_DEPRECATED is now needed for SYSFS_DEPRECATED_V2;
 - PWM is now needed for BACKLIGHT_PWM;
 - DEBUG_SPINLOCK_SLEEP was replaced by DEBUG_ATOMIC_SLEEP;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

The config was not updated for some time so it needs updates to get the
same options as wanted initially:
 - IP_NF_TARGET_LOG was replaced by NETFILTER_XT_TARGET_LOG;
 - NF_NAT was replaced by IP_NF_NAT;
 - SERIAL_DEV_BUS is now needed for BT_HCIUART_LL;
 - TPS65010 is now needed for MACH_OSIRIS_DVS;
 - DMADEVICES and S3C24XX_DMAC are now needed for MMC_S3C;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

The config was not updated for some time so it needs updates to get the
same options as wanted initially:
 - SYSFS_DEPRECATED is now needed for SYSFS_DEPRECATED_V2;
 - USB_GADGET_S3C2410 was replaced by USB_S3C2410;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

The config was not updated for some time so it needs updates to get the
same options as wanted initially:
 - SERIAL_DEV_BUS is now needed for BT_HCIUART_LL;
 - USB_GADGET_S3C2410 was replaced by USB_S3C2410;
 - S3C24XX_DMAC is now needed for MMC_S3C;
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Re-order entries just like savedefconfig would do so it will be easier
to review the changes before actual savedefconfig.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Remove old, dead Kconfig options (in order appearing in this commit):
 - EXPERIMENTAL is gone since v3.9;
 - INET_LRO: commit 7bbf3cae ("ipv4: Remove inet_lro library");
 - MTD_CONCAT: commit f53fdebc ("mtd: drop MTD_CONCAT from Kconfig entirely");
 - MTD_PARTITIONS: commit 6a8a98b2 ("mtd: kill CONFIG_MTD_PARTITIONS");
 - MTD_CHAR: commit 660685d9 ("mtd: merge mtdchar module with mtdcore");
 - NETDEV_1000 and NETDEV_10000: commit f860b052 ("drivers/net:
   Kconfig and Makefile cleanup"); NET_ETHERNET should be replaced with
   just ETHERNET but that is separate change;
 - INOTIFY: commit 2dfc1cae ("inotify: remove inotify in kernel interface");
 - MISC_DEVICES: commit 7c5763b8 ("drivers: misc: Remove
   MISC_DEVICES config option");
 - HID_SUPPORT: commit 1f41a6a9 ("HID: Fix the generic Kconfig options");
 - BT_L2CAP and BT_SCO: commit f1e91e16 ("Bluetooth: Always compile
   SCO and L2CAP in Bluetooth Core");
 - DEBUG_ERRORS: commit b025a3f8 ("ARM: 6876/1: Kconfig.debug:
   Remove unused CONFIG_DEBUG_ERRORS");
 - USB_DEVICE_CLASS: commit 007bab91 ("USB: remove CONFIG_USB_DEVICE_CLASS");
 - RCU_CPU_STALL_DETECTOR: commit a00e0d71 ("rcu: Remove conditional
   compilation for RCU CPU stall warnings");
 - SYSCTL_SYSCALL_CHECK: commit 7c60c48f ("sysctl: Improve the
   sysctl sanity checks");
 - IP_NF_QUEUE: commit 3dd6664f ("netfilter: remove unused "config IP_NF_QUEUE"");
 - IP_NF_TARGET_ULOG: commit d4da843e ("netfilter: kill remnants of ulog targets");
 - IP6_NF_QUEUE: commit d16cf20e ("netfilter: remove ip_queue support");
 - IP6_NF_TARGET_LOG: commit 6939c33a ("netfilter: merge ipt_LOG and
   ip6_LOG into xt_LOG");
 - USB_LED: commit a335aaf3 ("usb: misc: remove outdated USB LED driver");
 - MMC_UNSAFE_RESUME: commit 2501c917 ("mmc: core: Use
   MMC_UNSAFE_RESUME as default behavior");
 - AUTOFS_FS: commit 561c5cf9 ("staging: Remove autofs3");
 - DISPLAY_SUPPORT: commit 5a6b5e02 ("fbdev: remove display subsystem");
 - CFG80211_REG_DEBUG: commit c799ba6e ("cfg80211: remove
   CFG80211_REG_DEBUG");
 - VIDEO_OUTPUT_CONTROL: commit f167a64e ("video / output: Drop
   display output class support");
 - USB_LIBUSUAL: commit f61870ee ("usb: remove libusual");
 - CRYPTO_ZLIB: commit 11049218 ("crypto: compress - remove unused
   pcomp interface");
 - BLK_DEV_UB: commit 68a5059e ("block: remove the deprecated ub driver");
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
[for vexpress]
Acked-by: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Enable STMPE1600 GPIO expander.
Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>

This patch adds STM32 watchdog support in stm32_defconfig file
Signed-off-by: Yannick Fertre <yannick.fertre@st.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>

These configs are required for booting kernel in QCOM IPQ4019 boards.
Signed-off-by: Abhishek Sahu <absahu@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

This option was removed by "make savedefconfig" in
commit c5054a98 ("ARM: imx_v6_v7_defconfig: Select SMSC_PHY")

This happened because CONFIG_DEBUG_FS was implicitly selected by
CONFIG_TREE_RCU_TRACE which defaulted to true because CONFIG_RCU_TRACE
was enabled by default by commit 96151825 ("rcu: Enable RCU
tracepoints by default to aid in debugging")

Recently however CONFIG_RCU_TRACE was completely removed by
commit 6e74c237c410 ("rcu: Remove debugfs tracing")

The result is that imx_v6_v7_defconfig no longer includes DEBUG_FS on
linux-next since next-20170517. This is bad, DEBUG_FS is extremely
useful for kernel introspection and testing.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

CPPI 4.1 DMA is now supported on AM18xx.
Update the config to use it instead of PIO mode.
Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

Pull thermal SoC management fixes from Eduardo Valentin:

 - fixes to TI SoC driver, Broadcom, qoriq

 - small sparse warning fix on thermal core

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: broadcom: ns-thermal: default on iProc SoCs
  ti-soc-thermal: Fix a typo in a comment line
  ti-soc-thermal: Delete error messages for failed memory allocations in ti_bandgap_build()
  ti-soc-thermal: Use devm_kcalloc() in ti_bandgap_build()
  thermal: core: make thermal_emergency_poweroff static
  thermal: qoriq: remove useless call for of_thermal_get_trip_points()

Pull tty/serial fixes from Greg KH:
 "Here are some serial and tty fixes for 4.12-rc3. They are a bit bigger
  than normal, which is why I had them bake in linux-next for a few
  weeks and didn't send them to you for -rc2.

  They revert a few of the serdev patches from 4.12-rc1, and bring
  things back to how they were in 4.11, to try to make things a bit more
  stable there. Rob and Johan both agree that this is the way forward,
  so this isn't people squabbling over semantics. Other than that, just
  a few minor serial driver fixes that people have had problems with.

  All of these have been in linux-next for a few weeks with no reported
  issues"

* tag 'tty-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: altera_uart: call iounmap() at driver remove
  serial: imx: ensure UCR3 and UFCR are setup correctly
  MAINTAINERS/serial: Change maintainer of jsm driver
  serial: enable serdev support
  tty/serdev: add serdev registration interface
  serdev: Restore serdev_device_write_buf for atomic context
  serial: core: fix crash in uart_suspend_port
  tty: fix port buffer locking
  tty: ehv_bytechan: clean up init error handling
  serial: ifx6x60: fix use-after-free on module unload
  serial: altera_jtaguart: adding iounmap()
  serial: exar: Fix stuck MSIs
  serial: efm32: Fix parity management in 'efm32_uart_console_get_options()'
  serdev: fix tty-port client deregistration
  Revert "tty_port: register tty ports with serdev bus"
  drivers/tty: 8250: only call fintek_8250_probe when doing port I/O

Pull powerpc fixes from Michael Ellerman:
 "Fix running SPU programs on Cell, and a few other minor fixes.

  Thanks to Alistair Popple, Jeremy Kerr, Michael Neuling, Nicholas
  Piggin"

* tag 'powerpc-4.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Add PPC_FEATURE userspace bits for SCV and DARN instructions
  powerpc/spufs: Fix hash faults for kernel regions
  powerpc: Fix booting P9 hash with CONFIG_PPC_RADIX_MMU=N
  powerpc/powernv/npu-dma.c: Fix opal_npu_destroy_context() call
  selftests/powerpc: Fix TM resched DSCR test with some compilers

Pull x86 fixes from Thomas Gleixner:
 "A series of fixes for X86:

   - The final fix for the end-of-stack issue in the unwinder
   - Handle non PAT systems gracefully
   - Prevent access to uninitiliazed memory
   - Move early delay calaibration after basic init
   - Fix Kconfig help text
   - Fix a cross compile issue
   - Unbreak older make versions"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/timers: Move simple_udelay_calibration past init_hypervisor_platform
  x86/alternatives: Prevent uninitialized stack byte read in apply_alternatives()
  x86/PAT: Fix Xorg regression on CPUs that don't support PAT
  x86/watchdog: Fix Kconfig help text file path reference to lockup watchdog documentation
  x86/build: Permit building with old make versions
  x86/unwind: Add end-of-stack check for ftrace handlers
  Revert "x86/entry: Fix the end of the stack for newly forked tasks"
  x86/boot: Use CROSS_COMPILE prefix for readelf