Arnd Bergmann [Tue, 10 May 2016 12:30:01 +0000 (14:30 +0200)]
Merge tag 'at91-defconfig2' of git://git./linux/kernel/git/nferre/linux-at91 into next/defconfig
Merge "Second batch of defconfig" from Nicolas Ferre:
- sama5_defconfig: update to support easy use of systemd userspace
* tag 'at91-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/defconfig: sama5: add CONFIG_FHANDLE
ARM: at91: sama5: Update defconfig
ARM: multi_v7_defconfig: add the Atmel sama5d2-compatible ADC driver
ARM: multi_v7_defconfig: add the Atmel Audio microphone interface PDMIC
ARM: multi_v7_defconfig: add Atmel ISI (Image Sensor Interface) driver
ARM: multi_v7_defconfig: add Atmel watchdog timers
ARM: multi_v7_defconfig: add HLCDC drivers as modules
ARM: at91/defconfig: add PDMIC driver to sama5_defconfig
ARM: at91/defconfig: add HLCDC driver to sama5_defconfig
ARM: at91/defconfig: add the HDMA controller to sama5_defconfig
Arnd Bergmann [Tue, 10 May 2016 12:25:54 +0000 (14:25 +0200)]
Merge tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux into next/defconfig
Merge "aspeed defconfig for 4.7" from Joel Stanley:
This adds configurations used for testing Aspeed BMC SoCs, as well as adding
the v5 part to the multi defconfig.
* tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux:
arm/configs: Add Aspeed defconfig
arm/configs/multi_v5: Add Aspeed ast2400
Arnd Bergmann [Tue, 10 May 2016 12:24:06 +0000 (14:24 +0200)]
Merge tag 'ux500-defconfig-armsoc2' of git://git./linux/kernel/git/linusw/linux-stericsson into next/defconfig
Merge "Ux500 defconfig update for v4.7" from Linus Walleij:
- Remove the unused MACH_UX500_DT option from the multi_v7 defconfig
- Remove staging driver from u8500_defconfig
- Update sensor support in u8500_defconfig
* tag 'ux500-defconfig-armsoc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: u8500_defconfig: update sensor config
ARM: u8500_defconfig: remove staging from defconfig
ARM: multi_v7_defconfig: Remove unused Kconfig option MACH_UX500_DT
Linus Walleij [Mon, 2 May 2016 08:38:04 +0000 (10:38 +0200)]
ARM: u8500_defconfig: update sensor config
The Ux500 is using buffered IIO as the sensors support
IRQs. The BH1780 ambient light sensor was added to IIO,
so disable the old misc driver and activate the driver
in IIO.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij [Mon, 2 May 2016 08:34:09 +0000 (10:34 +0200)]
ARM: u8500_defconfig: remove staging from defconfig
Ux500 was enabling the staging drivers due to the RMI4
touchscreen driver, this is now properly upstream, so drop
this and the dead symbol for the old RMI4 hack from
the defconfig.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Lee Jones [Thu, 31 Mar 2016 08:45:24 +0000 (09:45 +0100)]
ARM: multi_v7_defconfig: Remove unused Kconfig option MACH_UX500_DT
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Arnd Bergmann [Tue, 10 May 2016 12:08:29 +0000 (14:08 +0200)]
Merge tag 'imx-defconfig-4.7' of git://git./linux/kernel/git/shawnguo/linux into next/defconfig
Merge "i.MX defconfig updates for 4.7" from Shawn Guo:
- Update multi_v5_defconfig for i.MX21/27 and systemd support
- Update imx_v6_v7_defconfig to support devices found on various i.MX6
board: FT5x06 and TSC2004 touch, I2C GPIO, MICREL PHY and M41T80 RTC
* tag 'imx-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: add CONFIG_MICREL_PHY
ARM: imx_v6_v7_defconfig: add CONFIG_I2C_GPIO
ARM: multi_v5_defconfig: Enable recommended options for systemd
ARM: multi_v5_defconfig: Enable support for MX21/MX27
ARM: imx_v6_v7_defconfig: add CONFIG_RTC_DRV_M41T80
ARM: imx_v6_v7_defconfig: add CONFIG_I2C_MUX_GPIO
ARM: imx_v6_v7_defconfig: add FT5x06 and TSC2004 touch support
Arnd Bergmann [Tue, 10 May 2016 12:06:01 +0000 (14:06 +0200)]
Merge tag 'tegra-for-4.7-defconfig' of git://git./linux/kernel/git/tegra/linux into next/defconfig
Merge "ARM: tegra: Default configuration updates for v4.7-rc1" from Thierry Reding:
Enable the XUSB pad controller and XUSB controller drivers on the Tegra
and multi-v7 default configurations.
* tag 'tegra-for-4.7-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: multi_v7: Enable Tegra XUSB controller in defconfig
ARM: tegra: Enable XUSB controller in defconfig
Arnd Bergmann [Tue, 10 May 2016 12:03:53 +0000 (14:03 +0200)]
Merge tag 'davinci-for-v4.7/defconfig' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Merge "DaVinci defconfig updates for v4.7" from Sekhar Nori:
Some defconfig updates to support systemd
based filesystems, SPI NOR and GPIO sysfs
entries.
* tag 'davinci-for-v4.7/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: enable SPI and NOR as modules
ARM: davinci_all_defconfig: support systemd
ARM: davinci_all_defconfig: enable GPIO_SYSFS
Nicolas Ferre [Tue, 10 May 2016 07:57:41 +0000 (09:57 +0200)]
ARM: at91/defconfig: sama5: add CONFIG_FHANDLE
CONFIG_FHANDLE is listed as a mandatory kernel option for systemd. So
explicitly enable it to allow easy use of systemd userspace.
Reported-by: Marek Vasut <marex@denx.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Joel Stanley [Wed, 13 Apr 2016 06:59:14 +0000 (16:29 +0930)]
arm/configs: Add Aspeed defconfig
Signed-off-by: Joel Stanley <joel@jms.id.au>
Joel Stanley [Mon, 9 May 2016 09:38:05 +0000 (19:08 +0930)]
arm/configs/multi_v5: Add Aspeed ast2400
This adds the Aspeed ast2400 BMC SoC to the build.
The SoC has six UARTs so we need to enable the appropriate options for
SERIAL_8250
Signed-off-by: Joel Stanley <joel@jms.id.au>
Marek Vasut [Thu, 5 May 2016 20:31:35 +0000 (22:31 +0200)]
ARM: at91: sama5: Update defconfig
Enable CGROUPS support, so we can boot userspace that uses systemd on
top of kernel configured using this defconfig. The systemd userspace
depends on cgroups and without them, it dies in mysterious ways.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Marcel Ziswiler [Fri, 29 Apr 2016 20:40:19 +0000 (22:40 +0200)]
ARM: imx_v6_v7_defconfig: add CONFIG_MICREL_PHY
The driver for Micrel PHYs is required for the Apalis iMX6 module
plugged into a Ixora carrier board featuring an on-module Micrel
KSZ9031 Gigabit PHY.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Marcel Ziswiler [Fri, 29 Apr 2016 20:40:18 +0000 (22:40 +0200)]
ARM: imx_v6_v7_defconfig: add CONFIG_I2C_GPIO
The GPIO-based bitbanging I2C driver is required to make HDMI work on
the Apalis iMX6 module plugged into a Ixora carrier board featuring a
DDC channel to read a screen's EDID being hooked up to regular GPIOs.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Thierry Reding [Tue, 26 Apr 2016 17:01:45 +0000 (19:01 +0200)]
ARM: multi_v7: Enable Tegra XUSB controller in defconfig
Enable the XUSB pad controller and XUSB controller (implementing an XHCI
interface) in the multi_v7 default configuration.
The XUSB pad controller is built-in because it is needed by PCIe, which
in turn provides the onboard ethernet used for network boot on a Jetson
TK1.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Thierry Reding [Thu, 21 Apr 2016 09:52:14 +0000 (11:52 +0200)]
ARM: tegra: Enable XUSB controller in defconfig
Enable the XUSB pad controller and XUSB controller (implementing an XHCI
interface) in the Tegra default configuration.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Arnd Bergmann [Thu, 28 Apr 2016 22:07:48 +0000 (00:07 +0200)]
Merge tag 'omap-for-v4.7/defconfig-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/defconfig
Merge "Defconfig changes for omap2plus_defconfig for v4.7 merge window" from Tony Lindgren:
Mostly enable drivers used on various boards as loadable modules
where possible. Also one warning fix related to RXKAD changes
heading to v4.7. And run make save_defconfig to shrink down the
size a bit.
* tag 'omap-for-v4.7/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: Enable PWM and ir-rx51 as loadable modules
ARM: omap2plus_defconfig: Enable twl6030 USB phy as loadable module
ARM: omap2plus_defconfig: Fix warning due invalid RXKAD symbol value
ARM: omap2plus_defconfig: Update with make savedefconfig
ARM: omap2plus_defconfig: Enable MDIO Bus/PHY emulation support
ARM: omap2plus_defconfig: Enable DP83867 support
ARM: omap2plus_defconfig: Enable GPIO_TPIC2810
Arnd Bergmann [Thu, 28 Apr 2016 15:49:39 +0000 (17:49 +0200)]
Merge tag 'lpc32xx-defconfig-4.7' of git://github.com/vzapolskiy/linux-lpc32xx into next/defconfig
Merge "NXP LPC32xx defconfig updates for v4.7" from Vladimir Zapolskiy:
This includes savedefconfig update of lpc32xx_defconfig, which removes
a number of outdated config options, plus ARM PrimeCell PL17x memory
controller driver is enabled by default now, on LPC32xx boards the
controller is commonly used to access SDRAM and NOR.
* tag 'lpc32xx-defconfig-4.7' of git://github.com/vzapolskiy/linux-lpc32xx:
ARM: LPC32xx: add PL175 memory controller driver to defconfig
ARM: LPC32xx: defconfig update
Tony Lindgren [Wed, 27 Apr 2016 16:40:09 +0000 (09:40 -0700)]
ARM: omap2plus_defconfig: Enable PWM and ir-rx51 as loadable modules
These are available on n900.
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Nicolas Ferre [Tue, 26 Apr 2016 16:04:36 +0000 (18:04 +0200)]
ARM: multi_v7_defconfig: add the Atmel sama5d2-compatible ADC driver
Add the new sama5d2-compatible ADC driver as a module.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Nicolas Ferre [Tue, 26 Apr 2016 16:02:22 +0000 (18:02 +0200)]
ARM: multi_v7_defconfig: add the Atmel Audio microphone interface PDMIC
Add the Atmel Pulse Density Modulation Interface Controller (PDMIC) driver
as a module. It's used by sama5d2 SoC for instance.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Nicolas Ferre [Tue, 26 Apr 2016 16:00:24 +0000 (18:00 +0200)]
ARM: multi_v7_defconfig: add Atmel ISI (Image Sensor Interface) driver
Add the Atmel Image Sensor Interface (ISI) VIDEO driver as a module.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Nicolas Ferre [Tue, 26 Apr 2016 15:59:18 +0000 (17:59 +0200)]
ARM: multi_v7_defconfig: add Atmel watchdog timers
Add both Atmel watchdog timers to the multi_v7_defconfig. They are added
as part of the kernel because it's a core piece of the system.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Boris Brezillon [Wed, 30 Mar 2016 14:19:37 +0000 (16:19 +0200)]
ARM: multi_v7_defconfig: add HLCDC drivers as modules
Add the HLCDC drivers to multi_v7_defconfig.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Nicolas Ferre [Tue, 26 Apr 2016 15:36:31 +0000 (17:36 +0200)]
ARM: at91/defconfig: add PDMIC driver to sama5_defconfig
Add Pulse Density Modulation Interface Controller (PDMIC) driver compilation
for sama5 default configuration. Is used by sama5d2 SoC for instance.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Nicolas Ferre [Tue, 26 Apr 2016 14:20:07 +0000 (16:20 +0200)]
ARM: at91/defconfig: add HLCDC driver to sama5_defconfig
Add the LCD DRM driver with all its dependencies:
- the MFD driver
- the backlight PWM
- the simple panel driver
Remove the CONFIG_FB as it is not needed on any sama5 device.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Nicolas Ferre [Tue, 26 Apr 2016 13:44:30 +0000 (15:44 +0200)]
ARM: at91/defconfig: add the HDMA controller to sama5_defconfig
Selection of the HDMAC option is now needed to allow some sama5 devices
to have the DMA driver compiled and available.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Tony Lindgren [Tue, 26 Apr 2016 17:31:23 +0000 (10:31 -0700)]
ARM: omap2plus_defconfig: Enable twl6030 USB phy as loadable module
This is in use on omap4 boards.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Javier Martinez Canillas [Fri, 22 Apr 2016 17:53:19 +0000 (13:53 -0400)]
ARM: omap2plus_defconfig: Fix warning due invalid RXKAD symbol value
Commit
648af7fca159 ("rxrpc: Absorb the rxkad security module") changed
the RXKAD Kconfig symbol from tristate to boolean but the commit didn't
update the omap2plus_defconfig that was enabling CONFIG_RXKAD as module.
This leads to the following warning when using the omap2plus_defconfig:
arch/arm/configs/omap2plus_defconfig:112:warning: symbol value 'm' invalid for RXKAD
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Arnd Bergmann [Tue, 26 Apr 2016 11:11:15 +0000 (13:11 +0200)]
Merge tag 'renesas-pci-defconfig-for-v4.7' of git://git./linux/kernel/git/horms/renesas into next/defconfig
Merge "Renesas ARM Based SoC Pci Defconfig Updates for v4.7" from Simon Horman:
* Remove Gen2 designation from Kconfig for R-Car PCIE driver
* tag 'renesas-pci-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
PCI: rcar-pcie: Remove Gen2 designation from Kconfig
Vladimir Murzin [Mon, 25 Apr 2016 08:49:14 +0000 (09:49 +0100)]
ARM: configs: add MPS2 defconfig
This patch adds a new config for MPS2 platform.
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Arnd Bergmann [Mon, 25 Apr 2016 19:12:32 +0000 (21:12 +0200)]
Merge tag 'keystone_config_for_4.7' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/defconfig
Merge "ARM: Keystone HOTPLUG and PSCI config update for 4.7" from Santosh Shilimkar
* tag 'keystone_config_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: configs: keystone: Add CPU Hotplug related options
Arnd Bergmann [Mon, 25 Apr 2016 19:11:13 +0000 (21:11 +0200)]
Merge tag 'arm-soc/for-4.7/defconfig' of github.com/Broadcom/stblinux into next/defconfig
Merge "This pull request contains defconfig changes for Broadcom ARM-based SoCs"
from Florian Fainelli:
- Eric enables more BCM2835 peripherals in multi_v7_defconfig: watchdog, I2S,
switches from the sdhci-bcm2835 to the sdhci-iproc driver, DWC2 USB controller
- Eric also enables more BCM2835 peripherals in bcm2835_defconfig: VC4, NFS root
Power Management support, switching sdhci-bcm2835 for sdhci-iproc
* tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux:
ARM: bcm2835: Enable NFS root support.
ARM: bcm2835: Enable the VC4 graphics driver in the defconfig
ARM: bcm2835: Enable CONFIG_PM.
ARM: bcm2835: Switch BCM2835 to sdhci-iproc.c for MMC
ARM: multi_v7_defconfig: Build in DWC2 USB support
ARM: multi_v7_defconfig: Switch BCM2835 to sdhci-iproc.c for MMC
ARM: multi_v7_defconfig: Add more BCM2835 support
Arnd Bergmann [Mon, 25 Apr 2016 19:10:07 +0000 (21:10 +0200)]
Merge tag 'mvebu-defconfig-4.7-1' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge "mvebu defconfig for 4.7 (part 1)" from Gregory CLEMENT
- Use the new cryto engine(mv_cesa) in the mvebu and multi-arm
defcongig files
- Attach mvebu_*_defconfig to the mvebu maintainers
* tag 'mvebu-defconfig-4.7-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu_v5_defconfig: Switching to the new Marvell's cryptographic engine driver
ARM: multi_v7_defconfig: Enabling the new Marvell's cryptographic engine driver
MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers
ARM: mvebu_v7_defconfig: Enabling the new Marvell's cryptographic engine driver
Masahiro Yamada [Thu, 14 Apr 2016 07:54:24 +0000 (16:54 +0900)]
ARM: multi_v7_defconfig: enable Denali NAND controller
This NAND controller device is used on UniPhier SoCs (and I know
it is also used on SoC FPGA).
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Mon, 25 Apr 2016 19:05:37 +0000 (21:05 +0200)]
Merge tag 'samsung-defconfig-4.7' of git://git./linux/kernel/git/krzk/linux into next/defconfig
Merge "Defconfig (exynos and multi_v7) changes for Exynos based boards for v4.7" from Krzysztof Kozłowski:
1. Enable additional drivers for Trats2 board (Exynos4412).
2. Enable CPUFreq governors as modules.
* tag 'samsung-defconfig-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: multi_v7_defconfig: Enable CPUFreq governors as modules
ARM: exynos_defconfig: Enable CPUFreq governors as modules
ARM: exynos_defconfig: Enable Trats2 audio codec, touchscreen and sensors
Kevin Hilman [Fri, 15 Apr 2016 00:49:53 +0000 (17:49 -0700)]
ARM: davinci_all_defconfig: enable SPI and NOR as modules
Enable SPI driver and SPI NOR flash support as modules.
Tested with SPI NOR flash on DA850-EVM. Basic boot test only to confirm
NOR flash device detection.
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Sekhar Nori [Fri, 15 Apr 2016 08:49:26 +0000 (14:19 +0530)]
ARM: davinci_all_defconfig: support systemd
CONFIG_FHANDLE is required by systemd[1], which is the
default init system in more and more distributions.
So lets enable it for DaVinci platforms as well.
While at it, remove stale entry CONFIG_INOTIFY=y
[1] https://github.com/systemd/systemd/blob/master/README#L37
Acked-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Florian Fainelli [Fri, 22 Apr 2016 19:25:34 +0000 (12:25 -0700)]
Merge tag 'bcm2835-defconfig-next-2016-04-20' into defconfig/next
This pull request brings in changes for bcm2835_defconfig and
multi_v7_defconfig in 4.7.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Simon Horman [Thu, 21 Apr 2016 03:51:55 +0000 (13:51 +1000)]
PCI: rcar-pcie: Remove Gen2 designation from Kconfig
It appears that Gen2 is a misnomer for the R-Car PCIE driver
which also supports Gen 1 and Gen 3 SoCs. Accordingly, drop Gen 2
from the help text and Kconfig symbol.
Also, re-arange the Kconfig symbol name to use PCIE as the prefix.
This appears to be in keeping with other PCIE Kconfig symbols.
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Vladimir Zapolskiy [Mon, 18 Apr 2016 03:31:23 +0000 (06:31 +0300)]
ARM: LPC32xx: add PL175 memory controller driver to defconfig
The change enables build of ARM PrimeCell PL17x driver for LPC32xx
platform, the memory controller is commonly used to interface NOR
flash drives.
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Vladimir Zapolskiy [Mon, 18 Apr 2016 03:31:22 +0000 (06:31 +0300)]
ARM: LPC32xx: defconfig update
The change is a result of "make lpc32xx_defconfig; make savedefconfig"
run, a number of config options are removed:
CONFIG_BINFMT_AOUT=y -- not needed, legacy
CONFIG_FPE_NWFPE=y -- not needed, AEABI build
CONFIG_IPV6_PRIVACY=y -- removed build option
CONFIG_IPV6=y -- selected by default
CONFIG_MII=y -- not needed, board phys don't select library
CONFIG_MTD_CHAR=y -- removed build option
CONFIG_MTD_M25P80=y -- not needed, AT25 EEPROM driver is in use
CONFIG_USB_PHY=y -- selected by default
Acked-by: Sylvain Lemieux <slemieux.tyco@gmail.com>
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Romain Perier [Tue, 29 Mar 2016 08:02:28 +0000 (10:02 +0200)]
ARM: mvebu_v5_defconfig: Switching to the new Marvell's cryptographic engine driver
This enables the new driver for Marvell CESA crypto engines on all mvebu v5.
The old driver is no longer used, but it is still in the tree for fallback.
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Romain Perier [Fri, 18 Mar 2016 08:44:54 +0000 (09:44 +0100)]
ARM: multi_v7_defconfig: Enabling the new Marvell's cryptographic engine driver
This enables the new driver for Marvell CESA crypto engines on all ARMv7.
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Thomas Petazzoni [Tue, 29 Mar 2016 16:17:40 +0000 (18:17 +0200)]
MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers
The arch/arm/configs/mvebu_*_defconfig currently don't belong to any
maintainer, so get_maintainer returns only information based on
commits, which is not completely accurate.
Therefore, this commit replaces a useless empty newline in MAINTAINERS
by a line attaching those defconfigs to the appropriate Marvell EBU
maintainers.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Romain Perier [Sun, 20 Mar 2016 19:19:16 +0000 (20:19 +0100)]
ARM: mvebu_v7_defconfig: Enabling the new Marvell's cryptographic engine driver
This enables the new driver for Marvell CESA crypto engines on all mvebu v7.
Signed-off-by: Romain Perier <romain.perier@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Sekhar Nori [Thu, 7 Apr 2016 11:15:22 +0000 (16:45 +0530)]
ARM: davinci_all_defconfig: enable GPIO_SYSFS
CONFIG_GPIO_SYSFS provides a convenient way to
access GPIOs from userspace.
Enable it for DaVinci.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Olof Johansson [Wed, 13 Apr 2016 22:43:50 +0000 (15:43 -0700)]
Merge tag 'sti-defconfig-for-v4.7-1' of git://git./linux/kernel/git/mcoquelin/sti into next/defconfig
Highlights:
-----------
- Enable ST's HW Random number generator in multi_v7 defconfig
- Enable PWM regulator support in multi_v7 defconfig
- Enable ST's Power and Reset driver in multi_v7 defconfig
- Enable ST's PWM in multi_v7 defconfig
* tag 'sti-defconfig-for-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
ARM: multi_v7_defconfig: Enable ST's HW Random Number Generator
ARM: multi_v7_defconfig: Enable support for PWM Regulators
ARM: multi_v7_defconfig: Enable ST's Power Reset driver
ARM: multi_v7_defconfig: Enable ST's PWM driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Heiko Stuebner [Tue, 12 Apr 2016 01:20:04 +0000 (03:20 +0200)]
ARM: multi_v7_defconfig: Enable new Rockchip display-controller drivers
Three types of display controller-drivers where added recently. The
Analogix Displayport variant and Designware MIPI DSI used for example
on the rk3288 as well as the Innosilicon HDMI controller used on the
rk3036.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Heiko Stuebner [Tue, 12 Apr 2016 01:18:39 +0000 (03:18 +0200)]
ARM: multi_v7_defconfig: Enable Rockchip displayport phy
The displayport phy controls the output of the Analogix displayport
controller on Rockchip SoCs and is therefore one component to enable
veyron devices to use their internal display.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Tony Lindgren [Wed, 13 Apr 2016 21:39:45 +0000 (14:39 -0700)]
ARM: omap2plus_defconfig: Update with make savedefconfig
This shrinks the defconfig a bit and makes it easier to
generate minimal patches against it.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Yegor Yefremov [Fri, 8 Apr 2016 10:11:59 +0000 (12:11 +0200)]
ARM: omap2plus_defconfig: Enable MDIO Bus/PHY emulation support
MDIO Bus/PHY emulation with fixed speed/link PHYs will be used in
Baltos iR5221 devices to connect to ICPlus IP175D switch IC.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Nishanth Menon [Thu, 24 Mar 2016 22:52:49 +0000 (17:52 -0500)]
ARM: omap2plus_defconfig: Enable DP83867 support
Enable DP83867 Ethernet phy for supporting networking on DRA72-EVM rev C
(SR2.0).
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Lokesh Vutla [Wed, 23 Mar 2016 03:34:14 +0000 (09:04 +0530)]
ARM: omap2plus_defconfig: Enable GPIO_TPIC2810
Enable the TI TPIC2810 8-Bit LED Driver with I2C Interface. This is used
in AM335x ICEv2 Boards.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Olof Johansson [Wed, 13 Apr 2016 19:17:12 +0000 (12:17 -0700)]
Merge tag 'renesas-defconfig-for-v4.7' of git://git./linux/kernel/git/horms/renesas into next/defconfig
Renesas ARM Based SoC Defconfig Updates for v4.7
* Enable I2C demultiplexer and slave eeprom in
shmobile and multi_v7defconfigs
* tag 'renesas-defconfig-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: defconfig: enable I2C demultiplexer and slave eeprom
ARM: multi_v7_defconfig: enable I2C demultiplexer and slave eeprom
Signed-off-by: Olof Johansson <olof@lixom.net>
Keerthy [Wed, 13 Apr 2016 15:54:52 +0000 (08:54 -0700)]
ARM: configs: keystone: Add CPU Hotplug related options
Add the config options needed to get CPU hotplug functional.
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
Jan Luebbe [Sat, 26 Mar 2016 11:28:26 +0000 (12:28 +0100)]
ARM: multi_v5_defconfig: Enable recommended options for systemd
Enable FHANDLE, CGROUPS, BLK_DEV_BSG and DEVTMPFS as recommended by
systemd (which also matches the multi_v7 defconfig). Also enable IPV6,
which defaults to 'y' by now.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Javier Martinez Canillas [Fri, 8 Apr 2016 19:02:10 +0000 (15:02 -0400)]
ARM: multi_v7_defconfig: Enable CPUFreq governors as modules
Currently only the ondemand and performance CPUFreq policy governors are
enabled in multi_v7 defconfig. But the other governors are also useful
for some cases, enable them to allow users change the default if needed.
The options are enabled as module to keep the kernel image size minimal.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Javier Martinez Canillas [Fri, 8 Apr 2016 19:02:09 +0000 (15:02 -0400)]
ARM: exynos_defconfig: Enable CPUFreq governors as modules
Currently only the ondemand and performance CPUFreq policy governors are
enabled in the Exynos defconfig. But the other governors are also useful
for some cases, enable them to allow users change the default if needed.
The options are enabled as module to keep the kernel image size minimal.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Krzysztof Kozlowski [Mon, 4 Apr 2016 07:43:50 +0000 (16:43 +0900)]
ARM: exynos_defconfig: Enable Trats2 audio codec, touchscreen and sensors
The Exynos4412-based Trats2 board has Asahi Kasei AK 3-Axis
Magnetometer, CM36651 proximity/ambient light sensor, MMS114 touchscreen
and Wolfson Microelectronics WM1811 CODEC. Enable them in defconfig to
get some testing coverage and use its features.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Linus Torvalds [Mon, 11 Apr 2016 00:58:30 +0000 (17:58 -0700)]
Linux 4.6-rc3
Linus Torvalds [Mon, 11 Apr 2016 00:48:17 +0000 (17:48 -0700)]
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A couple of small fixes, and wiring up the new syscalls which appeared
during the merge window"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8550/1: protect idiv patching against undefined gcc behavior
ARM: wire up preadv2 and pwritev2 syscalls
ARM: SMP enable of cache maintanence broadcast
Linus Torvalds [Mon, 11 Apr 2016 00:38:55 +0000 (17:38 -0700)]
Merge tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc
Pull MMC fixes from Ulf Hansson:
"Here are a couple of mmc fixes intended for v4.6 rc3:
MMC host:
- sdhci: Fix regression setting power on Trats2 board
- sdhci-pci: Add support and PCI IDs for more Broxton host controllers"
* tag 'mmc-v4.6-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
mmc: sdhci-pci: Add support and PCI IDs for more Broxton host controllers
mmc: sdhci: Fix regression setting power on Trats2 board
Linus Torvalds [Mon, 11 Apr 2016 00:04:42 +0000 (17:04 -0700)]
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Some bugfixes from I2C:
- fix a uevent triggered boot problem by removing a useless debug
print
- fix sysfs-attributes of the new i2c-demux-pinctrl driver to follow
standard kernel behaviour
- fix a potential division-by-zero error (needed two takes)"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: jz4780: really prevent potential division by zero
Revert "i2c: jz4780: prevent potential division by zero"
i2c: jz4780: prevent potential division by zero
i2c: mux: demux-pinctrl: Update docs to new sysfs-attributes
i2c: mux: demux-pinctrl: Clean up sysfs attributes
i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE
Linus Torvalds [Sun, 10 Apr 2016 23:52:24 +0000 (16:52 -0700)]
Revert "ext4: allow readdir()'s of large empty directories to be interrupted"
This reverts commit
1028b55bafb7611dda1d8fed2aeca16a436b7dff.
It's broken: it makes ext4 return an error at an invalid point, causing
the readdir wrappers to write the the position of the last successful
directory entry into the position field, which means that the next
readdir will now return that last successful entry _again_.
You can only return fatal errors (that terminate the readdir directory
walk) from within the filesystem readdir functions, the "normal" errors
(that happen when the readdir buffer fills up, for example) happen in
the iterorator where we know the position of the actual failing entry.
I do have a very different patch that does the "signal_pending()"
handling inside the iterator function where it is allowable, but while
that one passes all the sanity checks, I screwed up something like four
times while emailing it out, so I'm not going to commit it today.
So my track record is not good enough, and the stars will have to align
better before that one gets committed. And it would be good to get some
review too, of course, since celestial alignments are always an iffy
debugging model.
IOW, let's just revert the commit that caused the problem for now.
Reported-by: Greg Thelen <gthelen@google.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Sat, 9 Apr 2016 21:10:20 +0000 (14:10 -0700)]
Merge branch 'parisc-4.6-3' of git://git./linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"Since commit
0de798584bde ("parisc: Use generic extable search and
sort routines") module loading is boken on parisc, because the parisc
module loader wasn't prepared for the new R_PARISC_PCREL32 relocations.
In addition, due to that breakage, Mikulas Patocka noticed that
handling exceptions from modules probably never worked on parisc. It
was just masked by the fact that exceptions from modules don't happen
during normal use.
This patch series fixes those issues and survives the tests of the
lib/test_user_copy kernel module test. Some patches are tagged for
stable"
* 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Update comment regarding relative extable support
parisc: Unbreak handling exceptions from kernel modules
parisc: Fix kernel crash with reversed copy_from_user()
parisc: Avoid function pointers for kernel exception routines
parisc: Handle R_PARISC_PCREL32 relocations in kernel modules
Linus Torvalds [Sat, 9 Apr 2016 21:05:45 +0000 (14:05 -0700)]
Merge branch 'libnvdimm-fixes' of git://git./linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fixes from Dan Williams:
"Three fixes, the first two are tagged for -stable:
- The ndctl utility/library gained expanded unit tests illuminating a
long standing bug in the libnvdimm SMART data retrieval
implementation.
It has been broken since its initial implementation, now fixed.
- Another one line fix for the detection of stale info blocks.
Without this change userspace can get into a situation where it is
unable to reconfigure a namespace.
- Fix the badblock initialization path in the presence of the new (in
v4.6-rc1) section alignment workarounds.
Without this change badblocks will be reported at the wrong offset.
These have received a build success report from the kbuild robot and
have appeared in -next with no reported issues"
* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment
libnvdimm, pfn: fix uuid validation
libnvdimm: fix smart data retrieval
Linus Torvalds [Sat, 9 Apr 2016 20:28:50 +0000 (13:28 -0700)]
Merge tag 'gpio-v4.6-3' of git://git./linux/kernel/git/linusw/linux-gpio
Pull GPIO fixes from Linus Walleij:
"Here is a set of four GPIO fixes. The two fixes to the core are
serious as they are regressing minor architectures.
Core fixes:
- Defer GPIO device setup until after gpiolib is initialized.
It turns out that a few very tightly integrated GPIO platform
drivers initialize so early (befor core_initcall()) so that the
gpiolib isn't even initialized itself. That limits what the
library can do, and we cannot reference uninitialized fields until
later.
Defer some of the initialization until right after the gpiolib is
initialized in these (rare) cases.
- As a consequence: do not use devm_* resources when allocating the
states in the initial set-up of the gpiochip.
Driver fixes:
- In ACPI retrieveal: ignore GpioInt when looking for output GPIOs.
- Fix legacy builds on the PXA without a backing pin controller.
- Use correct datatype on pca953x register writes"
* tag 'gpio-v4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
gpio: pca953x: Use correct u16 value for register word write
gpiolib: Defer gpio device setup until after gpiolib initialization
gpiolib: Do not use devm functions when registering gpio chip
gpio: pxa: fix legacy non pinctrl aware builds
gpio / ACPI: ignore GpioInt() GPIOs when requesting GPIO_OUT_*
Linus Torvalds [Sat, 9 Apr 2016 19:32:44 +0000 (12:32 -0700)]
Merge tag 'tty-4.6-rc3' of git://git./linux/kernel/git/gregkh/tty
Pull tty fixes from Greg KH:
"Here are two tty fixes for issues found.
One was due to a merge error in 4.6-rc1, and the other a regression
fix for UML consoles that broke in 4.6-rc1.
Both have been in linux-next for a while"
* tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
tty: Fix merge of "tty: Refactor tty_open()"
tty: Fix UML console breakage
Linus Torvalds [Sat, 9 Apr 2016 19:23:02 +0000 (12:23 -0700)]
Merge tag 'usb-4.6-rc3' of git://git./linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are some USB fixes and new device ids for 4.6-rc3.
Nothing major, the normal USB gadget fixes and usb-serial driver ids,
along with some other fixes mixed in. All except the USB serial ids
have been tested in linux-next, the id additions should be fine as
they are 'trivial'"
* tag 'usb-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (25 commits)
USB: option: add "D-Link DWM-221 B1" device id
USB: serial: cp210x: Adding GE Healthcare Device ID
USB: serial: ftdi_sio: Add support for ICP DAS I-756xU devices
usb: dwc3: keystone: drop dma_mask configuration
usb: gadget: udc-core: remove manual dma configuration
usb: dwc3: pci: add ID for one more Intel Broxton platform
usb: renesas_usbhs: fix to avoid using a disabled ep in usbhsg_queue_done()
usb: dwc2: do not override forced dr_mode in gadget setup
usb: gadget: f_midi: unlock on error
USB: digi_acceleport: do sanity checking for the number of ports
USB: cypress_m8: add endpoint sanity check
USB: mct_u232: add sanity checking in probe
usb: fix regression in SuperSpeed endpoint descriptor parsing
USB: usbip: fix potential out-of-bounds write
usb: renesas_usbhs: disable TX IRQ before starting TX DMAC transfer
usb: renesas_usbhs: avoid NULL pointer derefernce in usbhsf_pkt_handler()
usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize
usb: phy: qcom-8x16: fix regulator API abuse
usb: ch9: Fix SSP Device Cap wFunctionalitySupport type
usb: gadget: composite: Access SSP Dev Cap fields properly
...
Linus Torvalds [Sat, 9 Apr 2016 19:09:37 +0000 (12:09 -0700)]
Merge tag 'staging-4.6-rc3' of git://git./linux/kernel/git/gregkh/staging
Pull staging and IIO driver fixes from Greg KH:
"Here are some IIO driver fixes, along with two staging driver fixes
for 4.6-rc3.
One staging driver patch reverts the deletion of a driver that
happened in 4.6-rc1. We thought that laptop.org was dead, but it's
still alive and kicking, and has users that were mad we broke their
hardware by deleting a driver for their machines. So that driver is
added back and everyone is happy again.
All of these have been in linux-next for a while with no reported
issues"
* tag 'staging-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
Revert "Staging: olpc_dcon: Remove obsolete driver"
staging/rdma/hfi1: select CRC32
iio: gyro: bmg160: fix buffer read values
iio: gyro: bmg160: fix endianness when reading axes
iio: accel: bmc150: fix endianness when reading axes
iio: st_magn: always define ST_MAGN_TRIGGER_SET_STATE
iio: fix config watermark initial value
iio: health: max30100: correct FIFO check condition
iio: imu: Fix inv_mpu6050 dependencies
iio: adc: Fix build error of missing devm_ioremap_resource on UM
iio: light: apds9960: correct FIFO check condition
iio: adc: max1363: correct reference voltage
iio: adc: max1363: add missing adc to max1363_id
Linus Torvalds [Sat, 9 Apr 2016 19:00:42 +0000 (12:00 -0700)]
Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is a set of eight fixes.
Two are trivial gcc-6 updates (brace additions and unused variable
removal). There's a couple of cxlflash regressions, a correction for
sd being overly chatty on revalidation (causing excess log increases).
A VPD issue which could crash USB devices because they seem very
intolerant to VPD inquiries, an ALUA deadlock fix and a mpt3sas buffer
overrun fix"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: Do not attach VPD to devices that don't support it
sd: Fix excessive capacity printing on devices with blocks bigger than 512 bytes
scsi_dh_alua: Fix a recently introduced deadlock
scsi: Declare local symbols static
cxlflash: Move to exponential back-off when cmd_room is not available
cxlflash: Fix regression issue with re-ordering patch
mpt3sas: Don't overreach ioc->reply_post[] during initialization
aacraid: add missing curly braces
Linus Torvalds [Sat, 9 Apr 2016 18:23:27 +0000 (11:23 -0700)]
Merge tag 'md/4.6-rc2-fix' of git://git./linux/kernel/git/shli/md
Pull MD fixes from Shaohua Li:
"This update mainly fixes bugs:
- fix error handling (Guoqing)
- fix a crash when a disk is hotremoved (me)
- fix a dead loop (Wei Fang)"
* tag 'md/4.6-rc2-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
md/bitmap: clear bitmap if bitmap_create failed
MD: add rdev reference for super write
md: fix a trivial typo in comments
md:raid1: fix a dead loop when read from a WriteMostly disk
Linus Torvalds [Sat, 9 Apr 2016 18:03:48 +0000 (11:03 -0700)]
Merge tag 'pm+acpi-4.6-rc3' of git://git./linux/kernel/git/rafael/linux-pm
Pull power management and ACPI fixes from Rafael Wysocki:
"Fixes for some issues discovered after recent changes and for some
that have just been found lately regardless of those changes
(intel_pstate, intel_idle, PM core, mailbox/pcc, turbostat) plus
support for some new CPU models (intel_idle, Intel RAPL driver,
turbostat) and documentation updates (intel_pstate, PM core).
Specifics:
- intel_pstate fixes for two issues exposed by the recent switch over
from using timers and for one issue introduced during the 4.4 cycle
plus new comments describing data structures used by the driver
(Rafael Wysocki, Srinivas Pandruvada).
- intel_idle fixes related to CPU offline/online (Richard Cochran).
- intel_idle support (new CPU IDs and state definitions mostly) for
Skylake-X and Kabylake processors (Len Brown).
- PCC mailbox driver fix for an out-of-bounds memory access that may
cause the kernel to panic() (Shanker Donthineni).
- New (missing) CPU ID for one apparently overlooked Haswell model in
the Intel RAPL power capping driver (Srinivas Pandruvada).
- Fix for the PM core's wakeup IRQs framework to make it work after
wakeup settings reconfiguration from sysfs (Grygorii Strashko).
- Runtime PM documentation update to make it describe what needs to
be done during device removal more precisely (Krzysztof Kozlowski).
- Stale comment removal cleanup in the cpufreq-dt driver (Viresh
Kumar).
- turbostat utility fixes and support for Broxton, Skylake-X and
Kabylake processors (Len Brown)"
* tag 'pm+acpi-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (28 commits)
PM / wakeirq: fix wakeirq setting after wakup re-configuration from sysfs
tools/power turbostat: work around RC6 counter wrap
tools/power turbostat: initial KBL support
tools/power turbostat: initial SKX support
tools/power turbostat: decode BXT TSC frequency via CPUID
tools/power turbostat: initial BXT support
tools/power turbostat: print IRTL MSRs
tools/power turbostat: SGX state should print only if --debug
intel_idle: Add KBL support
intel_idle: Add SKX support
intel_idle: Clean up all registered devices on exit.
intel_idle: Propagate hot plug errors.
intel_idle: Don't overreact to a cpuidle registration failure.
intel_idle: Setup the timer broadcast only on successful driver load.
intel_idle: Avoid a double free of the per-CPU data.
intel_idle: Fix dangling registration on error path.
intel_idle: Fix deallocation order on the driver exit path.
intel_idle: Remove redundant initialization calls.
intel_idle: Fix a helper function's return value.
intel_idle: remove useless return from void function.
...
Linus Torvalds [Sat, 9 Apr 2016 17:50:44 +0000 (10:50 -0700)]
Merge git://git./linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) Stale SKB data pointer access across pskb_may_pull() calls in L2TP,
from Haishuang Yan.
2) Fix multicast frame handling in mac80211 AP code, from Felix
Fietkau.
3) mac80211 station hashtable insert errors not handled properly, fix
from Johannes Berg.
4) Fix TX descriptor count limit handling in e1000, from Alexander
Duyck.
5) Revert a buggy netdev refcount fix in netpoll, from Bjorn Helgaas.
6) Must assign rtnl_link_ops of the device before registering it, fix
in ip6_tunnel from Thadeu Lima de Souza Cascardo.
7) Memory leak fix in tc action net exit, from WANG Cong.
8) Add missing AF_KCM entries to name tables, from Dexuan Cui.
9) Fix regression in GRE handling of csums wrt. FOU, from Alexander
Duyck.
10) Fix memory allocation alignment and congestion map corruption in
RDS, from Shamir Rabinovitch.
11) Fix default qdisc regression in tuntap driver, from Jason Wang.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
bridge, netem: mark mailing lists as moderated
tuntap: restore default qdisc
mpls: find_outdev: check for err ptr in addition to NULL check
ipv6: Count in extension headers in skb->network_header
RDS: fix congestion map corruption for PAGE_SIZE > 4k
RDS: memory allocated must be align to 8
GRE: Disable segmentation offloads w/ CSUM and we are encapsulated via FOU
net: add the AF_KCM entries to family name tables
MAINTAINERS: intel-wired-lan list is moderated
lib/test_bpf: Add additional BPF_ADD tests
lib/test_bpf: Add test to check for result of 32-bit add that overflows
lib/test_bpf: Add tests for unsigned BPF_JGT
lib/test_bpf: Fix JMP_JSET tests
VSOCK: Detach QP check should filter out non matching QPs.
stmmac: fix adjust link call in case of a switch is attached
af_packet: tone down the Tx-ring unsupported spew.
net_sched: fix a memory leak in tc action
samples/bpf: Enable powerpc support
samples/bpf: Use llc in PATH, rather than a hardcoded value
samples/bpf: Fix build breakage with map_perf_test_user.c
...
Linus Torvalds [Sat, 9 Apr 2016 17:41:34 +0000 (10:41 -0700)]
Merge branch 'for-linus-4.6' of git://git./linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"These are bug fixes, including a really old fsync bug, and a few trace
points to help us track down problems in the quota code"
* 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix file/data loss caused by fsync after rename and new inode
btrfs: Reset IO error counters before start of device replacing
btrfs: Add qgroup tracing
Btrfs: don't use src fd for printk
btrfs: fallback to vmalloc in btrfs_compare_tree
btrfs: handle non-fatal errors in btrfs_qgroup_inherit()
btrfs: Output more info for enospc_debug mount option
Btrfs: fix invalid reference in replace_path
Btrfs: Improve FL_KEEP_SIZE handling in fallocate
Linus Torvalds [Sat, 9 Apr 2016 17:33:58 +0000 (10:33 -0700)]
Merge tag 'for-linus-4.6-ofs1' of git://git./linux/kernel/git/hubcap/linux
Pull orangefs fixes from Mike Marshall:
"Orangefs cleanups and a strncpy vulnerability fix.
Cleanups:
- remove an unused variable from orangefs_readdir.
- clean up printk wrapper used for ofs "gossip" debugging.
- clean up truncate ctime and mtime setting in inode.c
- remove a useless null check found by coccinelle.
- optimize some memcpy/memset boilerplate code.
- remove some useless sanity checks from xattr.c
Fix:
- fix a potential strncpy vulnerability"
* tag 'for-linus-4.6-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: remove unused variable
orangefs: Add KERN_<LEVEL> to gossip_<level> macros
orangefs: strncpy -> strscpy
orangefs: clean up truncate ctime and mtime setting
Orangefs: fix ifnullfree.cocci warnings
Orangefs: optimize boilerplate code.
Orangefs: xattr.c cleanup
Linus Torvalds [Sat, 9 Apr 2016 17:23:45 +0000 (10:23 -0700)]
Merge tag 'iommu-fixes-v4.6-rc2' of git://git./linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
- compile-time fixes (warnings and failures)
- a bug in iommu core code which could cause the group->domain pointer
to be falsly cleared
- fix in scatterlist handling of the ARM common DMA-API code
- stall detection fix for the Rockchip IOMMU driver
* tag 'iommu-fixes-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/vt-d: Silence an uninitialized variable warning
iommu/rockchip: Fix "is stall active" check
iommu: Don't overwrite domain pointer when there is no default_domain
iommu/dma: Restore scatterlist offsets correctly
iommu: provide of_xlate pointer unconditionally
Wolfram Sang [Sun, 3 Apr 2016 21:32:00 +0000 (23:32 +0200)]
i2c: jz4780: really prevent potential division by zero
Make sure we avoid a division-by-zero OOPS in case clock-frequency is
set too low in DT. Add missing '\n' while we are here.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Axel Lin <axel.lin@ingics.com>
Wolfram Sang [Sat, 9 Apr 2016 06:32:37 +0000 (08:32 +0200)]
Revert "i2c: jz4780: prevent potential division by zero"
This reverts commit
34cf2acdafaa31a13821e45de5ee896adcd307b1. 'ret' is
not set when bailing out. Also, there is a better place to check for 0.
Reported-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Greg Kroah-Hartman [Fri, 8 Apr 2016 22:41:58 +0000 (15:41 -0700)]
Merge tag 'usb-serial-4.6-rc3' of git://git./linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.6-rc3
Here are some new device ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
David S. Miller [Fri, 8 Apr 2016 20:41:28 +0000 (16:41 -0400)]
Merge tag 'mac80211-for-davem-2016-04-06' of git://git./linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
For the current RC series, we have the following fixes:
* TDLS fixes from Arik and Ilan
* rhashtable fixes from Ben and myself
* documentation fixes from Luis
* U-APSD fixes from Emmanuel
* a TXQ fix from Felix
* and a compiler warning suppression from Jeff
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
stephen hemminger [Tue, 5 Apr 2016 20:43:53 +0000 (13:43 -0700)]
bridge, netem: mark mailing lists as moderated
I moderate these (lightly loaded) lists to block spam.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Helge Deller [Fri, 8 Apr 2016 19:36:06 +0000 (21:36 +0200)]
parisc: Update comment regarding relative extable support
Update the comment to reflect the changes of commit
0de7985 (parisc: Use
generic extable search and sort routines).
Signed-off-by: Helge Deller <deller@gmx.de>
Helge Deller [Fri, 8 Apr 2016 16:32:52 +0000 (18:32 +0200)]
parisc: Unbreak handling exceptions from kernel modules
Handling exceptions from modules never worked on parisc.
It was just masked by the fact that exceptions from modules
don't happen during normal use.
When a module triggers an exception in get_user() we need to load the
main kernel dp value before accessing the exception_data structure, and
afterwards restore the original dp value of the module on exit.
Noticed-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org
Helge Deller [Fri, 8 Apr 2016 16:18:48 +0000 (18:18 +0200)]
parisc: Fix kernel crash with reversed copy_from_user()
The kernel module testcase (lib/test_user_copy.c) exhibited a kernel
crash on parisc if the parameters for copy_from_user were reversed
("illegal reversed copy_to_user" testcase).
Fix this potential crash by checking the fault handler if the faulting
address is in the exception table.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>
Helge Deller [Fri, 8 Apr 2016 16:11:33 +0000 (18:11 +0200)]
parisc: Avoid function pointers for kernel exception routines
We want to avoid the kernel module loader to create function pointers
for the kernel fixup routines of get_user() and put_user(). Changing
the external reference from function type to int type fixes this.
This unbreaks exception handling for get_user() and put_user() when
called from a kernel module.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org
Helge Deller [Fri, 8 Apr 2016 20:10:35 +0000 (22:10 +0200)]
parisc: Handle R_PARISC_PCREL32 relocations in kernel modules
Commit
0de7985 (parisc: Use generic extable search and sort routines)
changed the exception tables to use 32bit relative offsets.
This patch now adds support to the kernel module loader to handle such
R_PARISC_PCREL32 relocations for 32- and 64-bit modules.
Signed-off-by: Helge Deller <deller@gmx.de>
Jason Wang [Fri, 8 Apr 2016 05:26:48 +0000 (13:26 +0800)]
tuntap: restore default qdisc
After commit
f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using
alloc_netdev"), default qdisc was changed to noqueue because
tuntap does not set tx_queue_len during .setup(). This patch restores
default qdisc by setting tx_queue_len in tun_setup().
Fixes: f84bb1eac027 ("net: fix IFF_NO_QUEUE for drivers using alloc_netdev")
Cc: Phil Sutter <phil@nwl.cc>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Martin Brandenburg [Mon, 4 Apr 2016 20:26:38 +0000 (16:26 -0400)]
orangefs: remove unused variable
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Rafael J. Wysocki [Fri, 8 Apr 2016 19:46:56 +0000 (21:46 +0200)]
Merge branches 'pm-core', 'powercap' and 'pm-tools'
* pm-core:
PM / wakeirq: fix wakeirq setting after wakup re-configuration from sysfs
PM / runtime: Document steps for device removal
* powercap:
powercap: intel_rapl: Add missing Haswell model
* pm-tools:
tools/power turbostat: work around RC6 counter wrap
tools/power turbostat: initial KBL support
tools/power turbostat: initial SKX support
tools/power turbostat: decode BXT TSC frequency via CPUID
tools/power turbostat: initial BXT support
tools/power turbostat: print IRTL MSRs
tools/power turbostat: SGX state should print only if --debug
Rafael J. Wysocki [Fri, 8 Apr 2016 19:46:05 +0000 (21:46 +0200)]
Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'acpi-cppc'
* pm-cpufreq:
cpufreq: dt: Drop stale comment
cpufreq: intel_pstate: Documenation for structures
cpufreq: intel_pstate: fix inconsistency in setting policy limits
intel_pstate: Avoid extra invocation of intel_pstate_sample()
intel_pstate: Do not set utilization update hook too early
* pm-cpuidle:
intel_idle: Add KBL support
intel_idle: Add SKX support
intel_idle: Clean up all registered devices on exit.
intel_idle: Propagate hot plug errors.
intel_idle: Don't overreact to a cpuidle registration failure.
intel_idle: Setup the timer broadcast only on successful driver load.
intel_idle: Avoid a double free of the per-CPU data.
intel_idle: Fix dangling registration on error path.
intel_idle: Fix deallocation order on the driver exit path.
intel_idle: Remove redundant initialization calls.
intel_idle: Fix a helper function's return value.
intel_idle: remove useless return from void function.
* acpi-cppc:
mailbox: pcc: Don't access an unmapped memory address space
Joe Perches [Sun, 27 Mar 2016 21:34:52 +0000 (14:34 -0700)]
orangefs: Add KERN_<LEVEL> to gossip_<level> macros
Emit the logging messages at the appropriate levels.
Miscellanea:
o Change format to fmt
o Use the more common ##__VA_ARGS__
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Martin Brandenburg [Fri, 8 Apr 2016 17:33:21 +0000 (13:33 -0400)]
orangefs: strncpy -> strscpy
It would have been possible for a rogue client-core to send in a symlink
target which is not NUL terminated. This returns EIO if the client-core
gives us corrupt data.
Leave debugfs and superblock code as is for now.
Other dcache.c and namei.c strncpy instances are safe because
ORANGEFS_NAME_MAX = NAME_MAX + 1; there is always enough space for a
name plus a NUL byte.
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Martin Brandenburg [Mon, 4 Apr 2016 20:26:36 +0000 (16:26 -0400)]
orangefs: clean up truncate ctime and mtime setting
The ctime and mtime are always updated on a successful ftruncate and
only updated on a successful truncate where the size changed.
We handle the ``if the size changed'' bit.
This matches FUSE's behavior.
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
kbuild test robot [Sat, 26 Mar 2016 18:54:23 +0000 (02:54 +0800)]
Orangefs: fix ifnullfree.cocci warnings
fs/orangefs/orangefs-debugfs.c:130:2-26: WARNING: NULL check before freeing functions like kfree, debugfs_remove, debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider reorganizing relevant code to avoid passing NULL values.
NULL check before some freeing functions is not needed.
Based on checkpatch warning
"kfree(NULL) is safe this check is probably not required"
and kfreeaddr.cocci by Julia Lawall.
Generated by: scripts/coccinelle/free/ifnullfree.cocci
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Mike Marshall [Wed, 6 Apr 2016 15:19:37 +0000 (11:19 -0400)]
Orangefs: optimize boilerplate code.
Suggested by David Binderman <dcb314@hotmail.com>
The former can potentially be a performance win over the latter.
memcpy(d, s, len);
memset(d+len, c, size-len);
memset(d, c, size);
memcpy(d, s, len);
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Mike Marshall [Wed, 6 Apr 2016 14:52:38 +0000 (10:52 -0400)]
Orangefs: xattr.c cleanup
1. It is nonsense to test for negative size_t, suggested by
David Binderman <dcb314@hotmail.com>
2. By the time Orangefs gets called, the vfs has ensured that
name != NULL, and that buffer and size are sane.
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Roopa Prabhu [Fri, 8 Apr 2016 04:28:38 +0000 (21:28 -0700)]
mpls: find_outdev: check for err ptr in addition to NULL check
find_outdev calls inet{,6}_fib_lookup_dev() or dev_get_by_index() to
find the output device. In case of an error, inet{,6}_fib_lookup_dev()
returns error pointer and dev_get_by_index() returns NULL. But the function
only checks for NULL and thus can end up calling dev_put on an ERR_PTR.
This patch adds an additional check for err ptr after the NULL check.
Before: Trying to add an mpls route with no oif from user, no available
path to 10.1.1.8 and no default route:
$ip -f mpls route add 100 as 200 via inet 10.1.1.8
[ 822.337195] BUG: unable to handle kernel NULL pointer dereference at
00000000000003a3
[ 822.340033] IP: [<
ffffffff8148781e>] mpls_nh_assign_dev+0x10b/0x182
[ 822.340033] PGD
1db38067 PUD
1de9e067 PMD 0
[ 822.340033] Oops: 0000 [#1] SMP
[ 822.340033] Modules linked in:
[ 822.340033] CPU: 0 PID: 11148 Comm: ip Not tainted 4.5.0-rc7+ #54
[ 822.340033] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996),
BIOS
rel-1.7.5.1-0-g8936dbb-20141113_115728-nilsson.home.kraxel.org
04/01/2014
[ 822.340033] task:
ffff88001db82580 ti:
ffff88001dad4000 task.ti:
ffff88001dad4000
[ 822.340033] RIP: 0010:[<
ffffffff8148781e>] [<
ffffffff8148781e>]
mpls_nh_assign_dev+0x10b/0x182
[ 822.340033] RSP: 0018:
ffff88001dad7a88 EFLAGS:
00010282
[ 822.340033] RAX:
ffffffffffffff9b RBX:
ffffffffffffff9b RCX:
0000000000000002
[ 822.340033] RDX:
00000000ffffff9b RSI:
0000000000000008 RDI:
0000000000000000
[ 822.340033] RBP:
ffff88001ddc9ea0 R08:
ffff88001e9f1768 R09:
0000000000000000
[ 822.340033] R10:
ffff88001d9c1100 R11:
ffff88001e3c89f0 R12:
ffffffff8187e0c0
[ 822.340033] R13:
ffffffff8187e0c0 R14:
ffff88001ddc9e80 R15:
0000000000000004
[ 822.340033] FS:
00007ff9ed798700(0000) GS:
ffff88001fc00000(0000)
knlGS:
0000000000000000
[ 822.340033] CS: 0010 DS: 0000 ES: 0000 CR0:
0000000080050033
[ 822.340033] CR2:
00000000000003a3 CR3:
000000001de89000 CR4:
00000000000006f0
[ 822.340033] Stack:
[ 822.340033]
0000000000000000 0000000100000000 0000000000000000
0000000000000000
[ 822.340033]
0000000000000000 0801010a00000000 0000000000000000
0000000000000000
[ 822.340033]
0000000000000004 ffffffff8148749b ffffffff8187e0c0
000000000000001c
[ 822.340033] Call Trace:
[ 822.340033] [<
ffffffff8148749b>] ? mpls_rt_alloc+0x2b/0x3e
[ 822.340033] [<
ffffffff81488e66>] ? mpls_rtm_newroute+0x358/0x3e2
[ 822.340033] [<
ffffffff810e7bbc>] ? get_page+0x5/0xa
[ 822.340033] [<
ffffffff813b7d94>] ? rtnetlink_rcv_msg+0x17e/0x191
[ 822.340033] [<
ffffffff8111794e>] ? __kmalloc_track_caller+0x8c/0x9e
[ 822.340033] [<
ffffffff813c9393>] ?
rht_key_hashfn.isra.20.constprop.57+0x14/0x1f
[ 822.340033] [<
ffffffff813b7c16>] ? __rtnl_unlock+0xc/0xc
[ 822.340033] [<
ffffffff813cb794>] ? netlink_rcv_skb+0x36/0x82
[ 822.340033] [<
ffffffff813b4507>] ? rtnetlink_rcv+0x1f/0x28
[ 822.340033] [<
ffffffff813cb2b1>] ? netlink_unicast+0x106/0x189
[ 822.340033] [<
ffffffff813cb5b3>] ? netlink_sendmsg+0x27f/0x2c8
[ 822.340033] [<
ffffffff81392ede>] ? sock_sendmsg_nosec+0x10/0x1b
[ 822.340033] [<
ffffffff81393df1>] ? ___sys_sendmsg+0x182/0x1e3
[ 822.340033] [<
ffffffff810e4f35>] ?
__alloc_pages_nodemask+0x11c/0x1e4
[ 822.340033] [<
ffffffff8110619c>] ? PageAnon+0x5/0xd
[ 822.340033] [<
ffffffff811062fe>] ? __page_set_anon_rmap+0x45/0x52
[ 822.340033] [<
ffffffff810e7bbc>] ? get_page+0x5/0xa
[ 822.340033] [<
ffffffff810e85ab>] ? __lru_cache_add+0x1a/0x3a
[ 822.340033] [<
ffffffff81087ea9>] ? current_kernel_time64+0x9/0x30
[ 822.340033] [<
ffffffff813940c4>] ? __sys_sendmsg+0x3c/0x5a
[ 822.340033] [<
ffffffff8148f597>] ?
entry_SYSCALL_64_fastpath+0x12/0x6a
[ 822.340033] Code: 83 08 04 00 00 65 ff 00 48 8b 3c 24 e8 40 7c f2 ff
eb 13 48 c7 c3 9f ff ff ff eb 0f 89 ce e8 f1 ae f1 ff 48 89 c3 48 85 db
74 15 <48> 8b 83 08 04 00 00 65 ff 08 48 81 fb 00 f0 ff ff 76 0d eb 07
[ 822.340033] RIP [<
ffffffff8148781e>] mpls_nh_assign_dev+0x10b/0x182
[ 822.340033] RSP <
ffff88001dad7a88>
[ 822.340033] CR2:
00000000000003a3
[ 822.435363] ---[ end trace
98cc65e6f6b8bf11 ]---
After patch:
$ip -f mpls route add 100 as 200 via inet 10.1.1.8
RTNETLINK answers: Network is unreachable
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This page took 0.051654 seconds and 5 git commands to generate.