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

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

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

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

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

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

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

Merge remote-tracking branch 'input/next'

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

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

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

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

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

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

Merge remote-tracking branch 'drm-misc/topic/drm-misc'

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

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

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

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

Merge remote-tracking branch 'crypto/master'

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

Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next

This adds the ASoC codec interfaces for TDA998x HDMI audio from
Jyri Sarha.

* 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: dts: am335x-boneblack: Add HDMI audio support
  drm/i2c: tda998x: Register ASoC hdmi-codec and add audio DT binding
  drm/i2c: tda998x: Improve tda998x_configure_audio() audio related pdata

Merge remote-tracking branch 'mtd/master'

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

Initial merge window candidates for 4.9

- Merge in hns-roce driver (required also pulling in the current net-next
  from DaveM)
- Merge in shared mlx5 code (which DaveM also took)

# gpg: Signature made Fri 26 Aug 2016 01:19:54 AEST using RSA key ID 0E572FDD
# gpg: Can't check signature: public key not found

Merge tag 'sunxi-drm-for-4.9' of https://git./linux/kernel/git/mripard/linux into drm-next

Allwinner DRM changes for 4.9

This tag adds the support of a new SoC to sun4i-drm (the Allwinner A33),
and the usual few fixes and enhancements

* tag 'sunxi-drm-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  drm/sun4i: add missing header dependencies
  drm/sun4i: Add a DRC driver
  drm/sun4i: backend: Handle the SAT
  drm/sun4i: support A33 tcon
  drm/sun4i: support TCONs without channel 1
  drm/sun4i: Clear encoder->bridge if a bridge is not found
  drm/sun4i: rgb: add missing calls to drm_panel_{prepare,unprepare}
  drm/sun4i: Remove redundant dev_err call in sun4i_tcon_init_regmap()
  drm/sun4i: Add bridge support
  drm/sun4i: Move panel retrieval in RGB connector
  drm/sun4i: Store TCON's device structure pointer

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

Merge remote-tracking branch 'bluetooth/master'

Merge tag 'topic/drm-misc-2016-09-08' of git://anongit.freedesktop.org/drm-intel into drm-next

* tag 'topic/drm-misc-2016-09-08' of git://anongit.freedesktop.org/drm-intel:
  drm: Fix error path in drm_mode_page_flip_ioctl()
  Revert "drm: Unify handling of blob and object properties"
  drm/udl: implement usb_driver suspend/resume.
  drm: fix signed integer overflow
  drm/atomic: Reject properties not part of the object.
  drm/doc: Add a few words on validation with IGT

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

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

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

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

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

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

Merge remote-tracking branch 'thermal/next'

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

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

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

Merge branch 'dmi/master'

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

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

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

Merge remote-tracking branch 'pci/next'

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

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

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

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

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

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

Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

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

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

Merge remote-tracking branch 'f2fs/dev'

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'ext3/for_next'

Merge remote-tracking branch 'ecryptfs/next'

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

Merge remote-tracking branch 'ceph/master'

Merge remote-tracking branch 'btrfs-kdave/for-next'

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

Merge remote-tracking branch 'xtensa/for_next'

Merge remote-tracking branch 'unicore32/unicore32'

Merge remote-tracking branch 'tile/master'

Merge remote-tracking branch 's390/features'

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

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 'h8300/h8300-next'

Merge remote-tracking branch 'blackfin/for-linus'

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

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

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

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

Merge remote-tracking branch 'renesas/next'

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

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

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

Merge remote-tracking branch 'keystone/next'

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

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

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

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

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

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

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 'crypto-current/master'

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

Merge remote-tracking branch 'usb-serial-fixes/usb-linus'

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

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

Merge remote-tracking branch 'mac80211/master'

Merge remote-tracking branch 'netfilter/master'

Merge remote-tracking branch 'ipsec/master'

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

drm/fence: allow fence waiting to be interrupted by userspace

If userspace is running an synchronously atomic commit and interrupts the
atomic operation during fence_wait() it will hang until the timer expires,
so here we change the wait to be interruptible so it stop immediately when
userspace wants to quit.

Also adds the necessary error checking for fence_wait().

v2: Comment by Daniel Vetter
- Add error checking for fence_wait()

v3: Rebase on top of new atomic noblocking support

v4: Comment by Maarten Lankhorst
- remove 'swapped' bitfield as it was duplicating information

v5: Comments by Maarten Lankhorst
- assign plane->state to plane_state if !intr
- squash previous patch into this one

v6: Comment by Sean Paul
- rename intr to pre_swap

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
[seanpaul fixed a couple checkpatch warnings and moved the preswap comment]
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1473707291-14781-1-git-send-email-gustavo@padovan.org