Merge branch 'linus' into x86/apic

Pull in update changes so we can apply conflicting patches

Merge tag 'xgene-dts-for-v4.5-v1' of https://github.com/AppliedMicro/xgene-next into next/dt64

Merge "DTS changes for X-Gene platforms queued for v4.5" from Duc Dang

This patch set adds DTS entries

Merge tag 'xgene-dts-for-v4.5-v1' of https://github.com/AppliedMicro/xgene-next into next/dt64

Merge "DTS changes for X-Gene platforms queued for v4.5" from Duc Dang

This patch set adds DTS entries to support various IPs
for X-Gene v1 and X-Gene v2 SoC:
- X-Gene v1: Enable support for MMC, USB, GPIO controllers,
I2C controller, L2 Cache topology
- X-Gene v2: Enable support for MMC, USB, GPIO controller,
I2C controller (with RTC), PCIe controller with GICv2m MSI,
EDAC, L2 Cache topology, TRNG

* tag 'xgene-dts-for-v4.5-v1' of https://github.com/AppliedMicro/xgene-next:
arm64: dts: Add L2 cache topology for APM X-Gene SoC
arm64: dts: Add RTC DTS entry for X-Gene v2 SoC platform
arm64: dts: Add Designware I2C controller DTS entries for X-Gene v2 SoC platform
arm64: dts: Add Designware I2C controller DTS entries for X-Gene v1 SoC
arm64: dts: Add APM X-Gene v2 SoC EDAC DTS entries
arm64: dts: Add APM X-Gene v2 SoC Designware GPIO controller DTS entry
arm64: dts: Add Designware GPIO dts binding for APM X-Gene v1 platform
arm64: dts: Add APM X-Gene v2 SoC GFC GPIO controller DTS entry
arm64: dts: Add APM X-Gene v1 SoC GFC GPIO controller DTS entries
arm64: dts: Add USB nodes for APM X-Gene v2 platforms
arm64: dts: Add USB nodes for APM X-Gene v1 platforms
arm64: dts: Add PCIe node for APM X-Gene v2 platforms
arm64: dts: Add v2m MSI frame nodes for APM X-Gene v2 platforms
arm64: dts: Add RNG device tree nodes for APM X-Gene v2 platform
arm64: dts: X-Gene: Do not reset or enable/disable clock for AHB block
arm64: dts: Add the arasan mmc DTS entries for APm X-Gene v2 SoC
arm64: dts: Add the arasan mmc DTS entries for APM X-Gene v1 SoC

show more ...

Merge branches 'acpi-pci' and 'pm-pci'

* acpi-pci:
x86/PCI/ACPI: Fix regression caused by commit 4d6b4e69a245

* pm-pci:
PCI / PM: Tune down retryable runtime suspend error messages

Merge tag 'v4.4-rc3' into next

Merge with Linux 4.4-rc3 to bring in helpers for multiu-driver modules.

Merge tag 'asoc-fix-v4.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v4.4

Quite a large batch of fixes have come in since the merge window, ma

Merge tag 'asoc-fix-v4.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v4.4

Quite a large batch of fixes have come in since the merge window, mainly
driver specific ones but there's a couple of core ones:

- A fix for DAPM resume on active streams to ensure everything ends up
cleanly in the right state.
- Reset the DAPM cache when freeing widgets to fix a crash on driver
remove and reload.

The PM functions for nau8825 are new code which fix crashes on resume.

show more ...

Merge tag 'v4.4-rc1' into HEAD

Linux 4.4-rc1

Sync to Linus v4.4-rc2 for LSM developers.

Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date: Thu Nov 5 23:04:11

Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date: Thu Nov 5 23:04:11 2015 +0200

drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

show more ...

arm64: dts: Add L2 cache topology for APM X-Gene SoC

In APM X-Gene SoC (both v1 and v2), each pair of processors
shares the same L2 cache. This patch adds l2-cache entries into
X-Gene SoC device tre

arm64: dts: Add L2 cache topology for APM X-Gene SoC

In APM X-Gene SoC (both v1 and v2), each pair of processors
shares the same L2 cache. This patch adds l2-cache entries into
X-Gene SoC device tree to demonstrate this configuration.

Signed-off-by: Duc Dang <dhdang@apm.com>

show more ...

arm64: dts: Add Designware I2C controller DTS entries for X-Gene v2 SoC platform

This patch adds DTS entries for Designware I2C controllers used in
APM X-Gene v2 evaluation platform (Merlin board).

arm64: dts: Add Designware I2C controller DTS entries for X-Gene v2 SoC platform

This patch adds DTS entries for Designware I2C controllers used in
APM X-Gene v2 evaluation platform (Merlin board).

X-Gene v2 has total 5 I2C controllers. On Merlin board only I2C1
and I2C4 controllers are available in Linux, where the other 3
controllers are used for management purpose (power management,
BMC function).

Signed-off-by: Duc Dang <dhdang@apm.com>

show more ...

arm64: dts: Add APM X-Gene v2 SoC EDAC DTS entries

This patch adds EDAC DTS entries for APM X-Gene v2 SoC.

Signed-off-by: Duc Dang <dhdang@apm.com>

arm64: dts: Add APM X-Gene v2 SoC Designware GPIO controller DTS entry

This patch adds Designware GPIO controller DTS node for APM
X-Gene v2 platforms.

Signed-off-by: Duc Dang <dhdang@apm.com>

arm64: dts: Add APM X-Gene v2 SoC GFC GPIO controller DTS entry

This patch adds the flash controller muxed gpio dts node for
APM X-Gene v2 SoC platforms.

Signed-off-by: Duc Dang <dhdang@apm.com>

arm64: dts: Add USB nodes for APM X-Gene v2 platforms

This patch adds USB node into APM X-Gene v2 device tree to enable
USB support for X-Gene v2 platforms.

Signed-off-by: Duc Dang <dhdang@apm.com>

arm64: dts: Add PCIe node for APM X-Gene v2 platforms

This patch adds PCIe node to support PCIe controller with MSI
capability for APM X-Gene v2 platform.

Signed-off-by: Duc Dang <dhdang@apm.com>

arm64: dts: Add v2m MSI frame nodes for APM X-Gene v2 platforms

This patch adds all 16 v2m MSI frames that APM X-Gene v2 SoC supports
into APM X-Gene v2 device tree.

Signed-off-by: Duc Dang <dhdang

arm64: dts: Add v2m MSI frame nodes for APM X-Gene v2 platforms

This patch adds all 16 v2m MSI frames that APM X-Gene v2 SoC supports
into APM X-Gene v2 device tree.

Signed-off-by: Duc Dang <dhdang@apm.com>

show more ...

arm64: dts: Add RNG device tree nodes for APM X-Gene v2 platform

This patch adds device tree nodes to enable driver for True Random
Number Generator (TRNG) on APM X-Gene v2 platforms.

Signed-off-by

arm64: dts: Add RNG device tree nodes for APM X-Gene v2 platform

This patch adds device tree nodes to enable driver for True Random
Number Generator (TRNG) on APM X-Gene v2 platforms.

Signed-off-by: Duc Dang <dhdang@apm.com>

show more ...

arm64: dts: X-Gene: Do not reset or enable/disable clock for AHB block

Remove register information used to reset and enable/disable clock
for AHB block as reseting AHB or disabling its clock will ma

arm64: dts: X-Gene: Do not reset or enable/disable clock for AHB block

Remove register information used to reset and enable/disable clock
for AHB block as reseting AHB or disabling its clock will make other
peripherals attached to it stop working.

Signed-off-by: Duc Dang <dhdang@apm.com>

show more ...

arm64: dts: Add the arasan mmc DTS entries for APm X-Gene v2 SoC

This patch adds the arasan mmc nodes to reuse the of-arasan
driver for APM X-Gene v2 SoC platforms.

Signed-off-by: Duc Dang <dhdang@

arm64: dts: Add the arasan mmc DTS entries for APm X-Gene v2 SoC

This patch adds the arasan mmc nodes to reuse the of-arasan
driver for APM X-Gene v2 SoC platforms.

Signed-off-by: Duc Dang <dhdang@apm.com>

show more ...

Merge tag 'v4.4-rc1' into patchwork

Linux 4.4-rc1

* tag 'v4.4-rc1': (12900 commits)
Linux 4.4-rc1
ARC: Fix silly typo in MAINTAINERS file
ARC: cpu_relax() to be compiler barrier even for UP

Merge tag 'v4.4-rc1' into patchwork

Linux 4.4-rc1

* tag 'v4.4-rc1': (12900 commits)
Linux 4.4-rc1
ARC: Fix silly typo in MAINTAINERS file
ARC: cpu_relax() to be compiler barrier even for UP
ARC: use ASL assembler mnemonic
ARC: [arcompact] Handle bus error from userspace as Interrupt not exception
ARC: remove extraneous header include
f2fs: xattr simplifications
squashfs: xattr simplifications
9p: xattr simplifications
xattr handlers: Pass handler to operations instead of flags
jffs2: Add missing capability check for listing trusted xattrs
hfsplus: Remove unused xattr handler list operations
ubifs: Remove unused security xattr handler
vfs: Fix the posix_acl_xattr_list return value
vfs: Check attribute names in posix acl xattr handers
mpt3sas: fix inline markers on non inline function declarations
dax: fix __dax_pmd_fault crash
Revert "drm/rockchip: Convert the probe function to the generic drm_of_component_probe()"
drm: Don't oops in drm_calc_timestamping_constants() if drm_vblank_init() wasn't called
ALSA: pci: depend on ZONE_DMA
...

show more ...

Merge v4.4-rc1 into MTD development

Sync up with the upstream development.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>

Merge branch 'x15-audio-fixes' into omap-for-v4.4/fixes

Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM DT updates from Olof Johansson:
"As usual, this is the massive branch we have for each release. Lots
o

Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM DT updates from Olof Johansson:
"As usual, this is the massive branch we have for each release. Lots
of various updates and additions of hardware descriptions on existing
hardware, as well as the usual additions of new boards and SoCs.

This is also the first release where we've started mixing 64- and
32-bit DT updates in one branch.

(Specific details on what's actually here and new is pretty easy to
tell from the diffstat, so there's little point in duplicating listing
it here)"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (499 commits)
ARM: dts: uniphier: add system-bus-controller nodes
ARM64: juno: disable NOR flash node by default
ARM: dts: uniphier: add outer cache controller nodes
arm64: defconfig: Enable PCI generic host bridge by default
arm64: Juno: Add support for the PCIe host bridge on Juno R1
Documentation: of: Document the bindings used by Juno R1 PCIe host bridge
ARM: dts: uniphier: add I2C aliases for ProXstream2 boards
dts/Makefile: Add build support for LS2080a QDS & RDB board DTS
dts/ls2080a: Add DTS support for LS2080a QDS & RDB boards
dts/ls2080a: Update Simulator DTS to add support of various peripherals
dts/ls2080a: Remove text about writing to Free Software Foundation
dts/ls2080a: Update DTSI to add support of various peripherals
doc: DTS: Update DWC3 binding to provide reference to generic bindings
doc/bindings: Update GPIO devicetree binding documentation for LS2080A
Documentation/dts: Move FSL board-specific bindings out of /powerpc
Documentation: DT: Add entry for FSL LS2080A QDS and RDB boards
arm64: Rename FSL LS2085A SoC support code to LS2080A
arm64: Use generic Layerscape SoC family naming
ARM: dts: uniphier: add ProXstream2 Vodka board support
ARM: dts: uniphier: add ProXstream2 Gentil board support
...

show more ...

Merge tag 'xgene-dts-for-v4.4-1' of https://github.com/AppliedMicro/xgene-next into next/dt

Merge "X-Gene DTS changes queued for v4.4" from Duc Dang:

* tag 'xgene-dts-for-v4.4-1' of https://github.

Merge tag 'xgene-dts-for-v4.4-1' of https://github.com/AppliedMicro/xgene-next into next/dt

Merge "X-Gene DTS changes queued for v4.4" from Duc Dang:

* tag 'xgene-dts-for-v4.4-1' of https://github.com/AppliedMicro/xgene-next:
arm64: dts: Add poweroff device nodes for APM X-Gene 2 platform
arm64: dts: Add APM X-Gene 2 standby GPIO controller DTS entries
arm64: dts: Add PMU node for APM X-Gene Storm SOC
Documentation: arm: pmu: Add Potenza PMU binding
arm64: dts: Add X-Gene v2 reboot driver dts node
arm64: dts: add APM Merlin Board device tree
power: reset: Add syscon poweroff device node for APM X-Gene platform
arm64: dts: Add X-Gene reboot driver dts node
Documentation: arm64: add SCU dts binding documentation to linux kernel
MAINTAINERS: Add Applied Micro (APM) X-Gene Device Tree maintainer

show more ...

arm64: dts: Add APM X-Gene 2 standby GPIO controller DTS entries

Add standby domain gpio controller for APM X-Gene 2 SoC platforms.

Signed-off-by: Duc Dang <dhdang@apm.com>