Merge remote-tracking branch 'irqchip/irqchip/for-next'

Merge remote-tracking branch 'edac-amd/for-next'

Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
arch/arm/boot/dts/vf610.dtsi

x86,vdso: Fix cross-compilation from big-endian architectures

This adds a macro GET(x) to convert x from big-endian to
little-endian.  Hopefully I put it everywhere it needs to go and got
all the cases needed for everyone's linux/elf.h.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>

x86,vdso: When vdso2c fails, unlink the output

This avoids bizarre failures if make is run again.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>

Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
arch/arm64/include/asm/thread_info.h
arch/arm64/mm/mmu.c
drivers/block/mtip32xx/mtip32xx.c

Merge remote-tracking branch 'spi/for-next'

Merge remote-tracking branch 'dt-rh/for-next'

Conflicts:
Documentation/kernel-parameters.txt

Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
arch/arm/mach-vexpress/platsmp.c

Merge remote-tracking branch 'audit/master'

Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt

Merge remote-tracking branch 'osd/linux-next'

Merge remote-tracking branch 'iommu/next'

Conflicts:
drivers/iommu/exynos-iommu.c

Merge remote-tracking branch 'watchdog/master'

Merge remote-tracking branch 'selinux/next'

Merge remote-tracking branch 'security/next'

Merge remote-tracking branch 'regulator/for-next'

Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
arch/arm/boot/dts/am437x-gp-evm.dts

Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Conflicts:
drivers/mmc/host/rtsx_usb_sdmmc.c

Merge remote-tracking branch 'md/for-next'

Merge remote-tracking branch 'slab/for-next'

Merge remote-tracking branch 'kgdb/kgdb-next'

Merge remote-tracking branch 'mmc-uh/next'

Revert "mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs"

This reverts commit 19b7f796c375a8098924717b171ac5058129d2c4.

Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
include/linux/omap-dma.h

Merge remote-tracking branch 'device-mapper/for-next'

Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/block/virtio_blk.c

Merge remote-tracking branch 'input/next'

Merge remote-tracking branch 'virtio/virtio-next'

Merge remote-tracking branch 'modules/modules-next'

Merge remote-tracking branch 'sound-asoc/for-next'

Merge remote-tracking branch 'sound/for-next'

Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/i915_drv.h

Merge remote-tracking branch 'drm-panel/drm/panel/for-next'

Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_gtt.c

Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/crypto_user.c
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
drivers/crypto/caam/error.c

Merge remote-tracking branch 'l2-mtd/master'

Merge remote-tracking branch 'infiniband/for-next'

Merge remote-tracking branch 'bluetooth/master'

Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c

Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c

Merge remote-tracking branch 'dmaengine/next'

Merge remote-tracking branch 'slave-dma/next'

Merge remote-tracking branch 'ieee1394/for-next'

Merge remote-tracking branch 'thermal/next'

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
drivers/cpufreq/exynos-cpufreq.c
drivers/cpufreq/exynos-cpufreq.h

Merge remote-tracking branch 'libata/for-next'

Merge remote-tracking branch 'kbuild/for-next'

Merge remote-tracking branch 'v4l-dvb/master'

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

Merge branch 'jdelvare-hwmon/master'

Merge remote-tracking branch 'i2c/i2c/for-next'

Merge remote-tracking branch 'hid/for-next'

Merge remote-tracking branch 'pci/next'

Conflicts:
arch/s390/pci/pci_sysfs.c

Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/ext4/file.c
fs/f2fs/file.c
fs/nfs/direct.c
fs/splice.c

Merge remote-tracking branch 'file-private-locks/linux-next'

Merge remote-tracking branch 'xfs/for-next'

Merge remote-tracking branch 'ubifs/linux-next'

Merge remote-tracking branch 'nfsd/nfsd-next'

Merge remote-tracking branch 'nfs/linux-next'

Merge remote-tracking branch 'logfs/master'

Merge remote-tracking branch 'jfs/jfs-next'

Merge remote-tracking branch 'gfs2/master'

Merge remote-tracking branch 'fscache/fscache'

Merge remote-tracking branch 'f2fs/dev'

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'ecryptfs/next'

Merge remote-tracking branch 'cifs/for-next'

Merge remote-tracking branch 'unicore32/unicore32'

Merge remote-tracking branch 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild

Merge remote-tracking branch 'tile/master'

Merge remote-tracking branch 'sparc-next/master'

Conflicts:
arch/sparc/include/asm/pgtable_64.h

Merge remote-tracking branch 's390/features'

Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/include/asm/sections.h

Merge remote-tracking branch 'mips/mips-for-linux-next'

Merge remote-tracking branch 'm68knommu/for-next'

Merge remote-tracking branch 'm68k/for-next'

Merge remote-tracking branch 'arm64/for-next/core'

Merge remote-tracking branch 'tegra/for-next'

Merge remote-tracking branch 'samsung/for-next'

Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/boot/dts/Makefile

Merge remote-tracking branch 'mvebu/for-next'

Merge remote-tracking branch 'imx-mxs/for-next'

Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

Merge remote-tracking branch 'berlin/berlin/for-next'

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-exynos/exynos.c
arch/arm/mach-mvebu/board-v7.c
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-rockchip/rockchip.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/common.c

Merge remote-tracking branch 'arm-perf/for-next/perf'

Merge remote-tracking branch 'arm/for-next'

Merge remote-tracking branch 'arc/for-next'

Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

Merge remote-tracking branch 'ide/master'

Merge remote-tracking branch 'input-current/for-linus'

Merge remote-tracking branch 'staging.current/staging-linus'

Merge remote-tracking branch 'usb.current/usb-linus'

Merge remote-tracking branch 'net/master'

Merge remote-tracking branch 'arm-current/fixes'

drm/i915: Drop locking around fbdev-fb in debugfs

All the date we print is invariant for the lifetime of the driver.
And none of it would be protected by the mode_config.mutex anyway.
So drop it.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

drm/i915: Fix context locking in debugfs

This goes all the way back to the introduction of this debugfs file,
even though back then no locking really was required. None of the
intermediate patches fixed this.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fix from Will Deacon:
 "Fix CoW regression for transparent hugepages by routing set_pmd_at to
  set_pte_at, which correctly handles PTE_WRITE and will mark the
  resulting table entry as read-only where appropriate"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: mm: fix pmd_write CoW brokenness