OSDN Git Service

uclinux-h8/linux.git
8 years agoMerge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:32:13 +0000 (11:32 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'

8 years agoMerge remote-tracking branch 'audit/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:31:07 +0000 (11:31 +1000)]
Merge remote-tracking branch 'audit/next'

8 years agoMerge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:30:21 +0000 (11:30 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'

8 years agoMerge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Fri, 25 Sep 2015 01:29:10 +0000 (11:29 +1000)]
Merge remote-tracking branch 'dwmw2-iommu/master'

8 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 25 Sep 2015 01:28:24 +0000 (11:28 +1000)]
Merge remote-tracking branch 'watchdog/master'

8 years agoMerge remote-tracking branch 'selinux/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:27:19 +0000 (11:27 +1000)]
Merge remote-tracking branch 'selinux/next'

8 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:26:13 +0000 (11:26 +1000)]
Merge remote-tracking branch 'regulator/for-next'

8 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 25 Sep 2015 01:25:09 +0000 (11:25 +1000)]
Merge remote-tracking branch 'battery/master'

8 years agoMerge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:23:31 +0000 (11:23 +1000)]
Merge remote-tracking branch 'mfd/for-mfd-next'

8 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:22:24 +0000 (11:22 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

8 years agoMerge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:21:13 +0000 (11:21 +1000)]
Merge remote-tracking branch 'mmc-uh/next'

8 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 25 Sep 2015 01:20:21 +0000 (11:20 +1000)]
Merge remote-tracking branch 'input/next'

8 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:19:35 +0000 (11:19 +1000)]
Merge remote-tracking branch 'modules/modules-next'

8 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:18:30 +0000 (11:18 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

8 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:17:04 +0000 (11:17 +1000)]
Merge remote-tracking branch 'sound/for-next'

8 years agoMerge remote-tracking branch 'drm-misc/topic/drm-misc'
Stephen Rothwell [Fri, 25 Sep 2015 01:15:08 +0000 (11:15 +1000)]
Merge remote-tracking branch 'drm-misc/topic/drm-misc'

8 years agoMerge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 01:13:44 +0000 (11:13 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'

8 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 25 Sep 2015 01:00:29 +0000 (11:00 +1000)]
Merge remote-tracking branch 'crypto/master'

8 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:59:25 +0000 (10:59 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

8 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:58:40 +0000 (10:58 +1000)]
Merge remote-tracking branch 'mtd/master'

8 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:57:28 +0000 (10:57 +1000)]
Merge remote-tracking branch 'bluetooth/master'

8 years agoMerge remote-tracking branch 'wireless-drivers-next/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:56:42 +0000 (10:56 +1000)]
Merge remote-tracking branch 'wireless-drivers-next/master'

8 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:50:16 +0000 (10:50 +1000)]
Merge remote-tracking branch 'net-next/master'

8 years agoMerge remote-tracking branch 'thermal-soc/next'
Stephen Rothwell [Fri, 25 Sep 2015 00:40:23 +0000 (10:40 +1000)]
Merge remote-tracking branch 'thermal-soc/next'

8 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 25 Sep 2015 00:39:17 +0000 (10:39 +1000)]
Merge remote-tracking branch 'thermal/next'

8 years agoMerge remote-tracking branch 'idle/next'
Stephen Rothwell [Fri, 25 Sep 2015 00:39:08 +0000 (10:39 +1000)]
Merge remote-tracking branch 'idle/next'

8 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:27:46 +0000 (10:27 +1000)]
Merge remote-tracking branch 'pm/linux-next'

8 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:26:59 +0000 (10:26 +1000)]
Merge remote-tracking branch 'libata/for-next'

8 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:25:45 +0000 (10:25 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

8 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:25:43 +0000 (10:25 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

8 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:24:57 +0000 (10:24 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

8 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:24:12 +0000 (10:24 +1000)]
Merge branch 'jdelvare-hwmon/master'

8 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:23:26 +0000 (10:23 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

8 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:22:33 +0000 (10:22 +1000)]
Merge remote-tracking branch 'hid/for-next'

8 years agoMerge remote-tracking branch 'file-locks/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:21:30 +0000 (10:21 +1000)]
Merge remote-tracking branch 'file-locks/linux-next'

8 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:20:41 +0000 (10:20 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'

8 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:19:56 +0000 (10:19 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

8 years agoMerge remote-tracking branch 'overlayfs/overlayfs-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:19:09 +0000 (10:19 +1000)]
Merge remote-tracking branch 'overlayfs/overlayfs-next'

8 years agoMerge remote-tracking branch 'orangefs/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:18:22 +0000 (10:18 +1000)]
Merge remote-tracking branch 'orangefs/for-next'

8 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:16:51 +0000 (10:16 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

8 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:15:59 +0000 (10:15 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

8 years agoMerge remote-tracking branch 'gfs2/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:15:14 +0000 (10:15 +1000)]
Merge remote-tracking branch 'gfs2/for-next'

8 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 25 Sep 2015 00:14:26 +0000 (10:14 +1000)]
Merge remote-tracking branch 'fscache/fscache'

8 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 25 Sep 2015 00:13:40 +0000 (10:13 +1000)]
Merge remote-tracking branch 'f2fs/dev'

8 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Fri, 25 Sep 2015 00:12:55 +0000 (10:12 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

8 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:12:10 +0000 (10:12 +1000)]
Merge remote-tracking branch 'cifs/for-next'

8 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:12:09 +0000 (10:12 +1000)]
Merge remote-tracking branch 'ceph/master'

8 years agoMerge remote-tracking branch 'uml/linux-next'
Stephen Rothwell [Fri, 25 Sep 2015 00:11:21 +0000 (10:11 +1000)]
Merge remote-tracking branch 'uml/linux-next'

8 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 25 Sep 2015 00:10:37 +0000 (10:10 +1000)]
Merge remote-tracking branch 'tile/master'

8 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 24 Sep 2015 23:56:53 +0000 (09:56 +1000)]
Merge remote-tracking branch 's390/features'

8 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:56:04 +0000 (09:56 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

8 years agoMerge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:56:01 +0000 (09:56 +1000)]
Merge remote-tracking branch 'metag/for-next'

8 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:55:17 +0000 (09:55 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

8 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:54:32 +0000 (09:54 +1000)]
Merge remote-tracking branch 'm68k/for-next'

8 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 24 Sep 2015 23:54:26 +0000 (09:54 +1000)]
Merge remote-tracking branch 'ia64/next'

8 years agoMerge remote-tracking branch 'h8300/h8300-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:53:36 +0000 (09:53 +1000)]
Merge remote-tracking branch 'h8300/h8300-next'

8 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:52:52 +0000 (09:52 +1000)]
Merge remote-tracking branch 'c6x/for-linux-next'

8 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:52:06 +0000 (09:52 +1000)]
Merge remote-tracking branch 'tegra/for-next'

8 years agoMerge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:51:21 +0000 (09:51 +1000)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'

8 years agoMerge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:50:37 +0000 (09:50 +1000)]
Merge remote-tracking branch 'samsung-krzk/for-next'

8 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:49:54 +0000 (09:49 +1000)]
Merge remote-tracking branch 'samsung/for-next'

8 years agoMerge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:49:09 +0000 (09:49 +1000)]
Merge remote-tracking branch 'rockchip/for-next'

8 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Thu, 24 Sep 2015 23:48:25 +0000 (09:48 +1000)]
Merge remote-tracking branch 'renesas/next'

8 years agoMerge remote-tracking branch 'qcom/qcom/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:47:40 +0000 (09:47 +1000)]
Merge remote-tracking branch 'qcom/qcom/for-next'

8 years agoMerge remote-tracking branch 'omap-pending/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:47:38 +0000 (09:47 +1000)]
Merge remote-tracking branch 'omap-pending/for-next'

8 years agoMerge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:46:48 +0000 (09:46 +1000)]
Merge remote-tracking branch 'omap/for-next'

8 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:46:40 +0000 (09:46 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

8 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Thu, 24 Sep 2015 23:45:58 +0000 (09:45 +1000)]
Merge remote-tracking branch 'keystone/next'

8 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:45:14 +0000 (09:45 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

8 years agoMerge remote-tracking branch 'cortex-m/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:44:31 +0000 (09:44 +1000)]
Merge remote-tracking branch 'cortex-m/for-next'

8 years agoMerge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:43:47 +0000 (09:43 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'

8 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:43:03 +0000 (09:43 +1000)]
Merge remote-tracking branch 'at91/at91-next'

8 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:42:19 +0000 (09:42 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

8 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 24 Sep 2015 23:40:36 +0000 (09:40 +1000)]
Merge remote-tracking branch 'arm/for-next'

8 years agoMerge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:35 +0000 (09:31 +1000)]
Merge remote-tracking branch 'rr-fixes/fixes'

8 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:33 +0000 (09:31 +1000)]
Merge remote-tracking branch 'crypto-current/master'

8 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:31 +0000 (09:31 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

8 years agoMerge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:30 +0000 (09:31 +1000)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'

8 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:30 +0000 (09:31 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'

8 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:29 +0000 (09:31 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'

8 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:29 +0000 (09:31 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'

8 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:28 +0000 (09:31 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

8 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:27 +0000 (09:31 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'

8 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:26 +0000 (09:31 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'

8 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:26 +0000 (09:31 +1000)]
Merge remote-tracking branch 'ipsec/master'

8 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:25 +0000 (09:31 +1000)]
Merge remote-tracking branch 'net/master'

8 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:24 +0000 (09:31 +1000)]
Merge remote-tracking branch 'sparc/master'

8 years agoMerge remote-tracking branch 'powerpc-fixes/fixes'
Stephen Rothwell [Thu, 24 Sep 2015 23:31:22 +0000 (09:31 +1000)]
Merge remote-tracking branch 'powerpc-fixes/fixes'

8 years agoDocumentation: arm: Fix typo in the idle-states bindings examples
Lorenzo Pieralisi [Thu, 24 Sep 2015 14:53:56 +0000 (15:53 +0100)]
Documentation: arm: Fix typo in the idle-states bindings examples

The idle-states bindings mandate that the entry-method string
in the idle-states node must be "psci" for ARM v8 64-bit systems,
but the examples in the bindings report a wrong entry-method string.
Owing to this typo, some dts in the kernel wrongly defined the
entry-method property, since they likely cut and pasted the example
definition without paying attention to the bindings definitions.

This patch fixes the typo in the DT idle states bindings examples and
respective dts in the kernel so that the bindings and related dts
files are made compliant.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Howard Chen <howard.chen@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Rob Herring <robh@kernel.org>
8 years agogpio: mention in DT binding doc that <name>-gpio is deprecated
Javier Martinez Canillas [Mon, 21 Sep 2015 12:57:25 +0000 (14:57 +0200)]
gpio: mention in DT binding doc that <name>-gpio is deprecated

The gpiolib supports parsing DT properties of the form <name>-gpio but it
was only added for compatibility with older DT bindings that got it wrong
and should not be used in newer bindings.

The commit that added support for this was:

dd34c37aa3e8 ("gpio: of: Allow -gpio suffix for property names")

but didn't update the documentation to explain this so it's been a source
of confusion. So let's make this clear in the GPIO DT binding doc.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Rob Herring <robh@kernel.org>
8 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...
David S. Miller [Thu, 24 Sep 2015 22:39:09 +0000 (15:39 -0700)]
Merge branch 'master' of git://git./linux/kernel/git/jkirsher/next-queue

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-09-23

This series contains updates to ixgbe only.

Mark provides all the changes in this series, first clears the destination
location for I2C data initially so that the received data will not be
corrupted by previous attempts.  Then reduced the pauses/delays in the
PHY detection when no SFP is present by reducing the number of retires,
once an SFP is detected, the "normal" number of retries in PHY detection
will be used.  Added support for X55EM_x SFP+ dual-speed, and fixed 1G and
10G link stability for X550EM_x by configuring the CS4227 correctly by
moving code to ixgbe_setup_mac_link_sfp_x550em().  Added functionality to
reset CS4227, since on some platforms the CS4227 does not initialize
properly.  Next reduces the SFP polling rate, due to when an SFP is not
present, the I2C timeouts that result are very costly.  So prevent the
SFP polling from being done more than once every two seconds.  Added
support for I2C bus MUX.  Fixed the setting of RDRXCTL register which
should fall through X540 and 82599, not 82598.  In addition, added small
packet padding support in X550 by setting RDRXCTL.PSP when the driver is
in SRIOV mode.  Fixed a known hardware issue where the PCI transactions
pending bit sticks high when there are pending transactions, so
workaround the issue by wait and then continue with our reset flow.
Added a new device ID for X550EM device with SFPs.  Provided a fix with
the DCA setup, which was suggested by Alex Duyck <aduyck@mirantis.com>,
by making it so that we always set the relaxed ordering bits related to
the DCA registers even if DCA is not enbaled.  Then moves the
configuration out of the ixgbe_down() and into ixgbe_configure() before
enabling the transmit and receive rings.  This ensures that DCA is
configured correctly before starting the processing of packets.
Fixed VM-to-VM loopback mode which requires that FCRTH be set, but
the datasheets did not specify what the value should be.  It has now
been determined that the correct value should be RXPBSIZE - (24*1024).
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agoMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Linus Torvalds [Thu, 24 Sep 2015 22:37:06 +0000 (15:37 -0700)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "Most of the GPU drivers people were at XDC last week, so I didn't get
  much to send, so I let it rollover until this week.

  Also Alex was away for 3 weeks so amdgpu/radeon got a bit more stuff
  than usual in one go.

  I've been trying to figure out some 4.2 issues with i915 still (that
  are fixed in 4.3, but bisecting ends up in a merge commit).  Hopefully
  next week I or i915 people can work that out"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (46 commits)
  drm: Allow also control clients to check the drm version
  drm/vmwgfx: Fix uninitialized return in vmw_kms_helper_dirty()
  drm/vmwgfx: Fix uninitialized return in vmw_cotable_unbind()
  drm/layerscape: fix handling fsl_dcu_drm_plane_index result
  drm/mgag200: Fix driver_load error handling
  drm/mgag200: Fix error handling paths in fbdev driver
  drm/qxl: only report first monitor as connected if we have no state
  drm/radeon: add quirk for MSI R7 370
  drm/amdgpu: Sprinkle drm_modeset_lock_all to appease locking checks
  drm/radeon: Sprinkle drm_modeset_lock_all to appease locking checks
  drm/amdgpu: sync ce and me with SWITCH_BUFFER(2)
  drm/amdgpu: integer overflow in amdgpu_mode_dumb_create()
  drm/amdgpu: info leak in amdgpu_gem_metadata_ioctl()
  drm/amdgpu: integer overflow in amdgpu_info_ioctl()
  drm/amdgpu: unwind properly in amdgpu_cs_parser_init()
  drm/amdgpu: Fix max_vblank_count value for current display engines
  drm/amdgpu: use kmemdup rather than duplicating its implementation
  drm/amdgpu: fix UVD suspend and resume for VI APU
  drm/amdgpu: fix the UVD suspend sequence order
  drm/amdgpu: make UVD handle checking more strict
  ...

8 years agoMerge tag 'mac80211-for-davem-2015-09-22' of git://git.kernel.org/pub/scm/linux/kerne...
David S. Miller [Thu, 24 Sep 2015 22:36:20 +0000 (15:36 -0700)]
Merge tag 'mac80211-for-davem-2015-09-22' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Just two small fixes:
 * VHT MCS mask array overrun, reported by Dan Carpenter
 * reset CQM history to always get a notification, from Sara Sharon
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agoip6_gre: Reduce log level in ip6gre_err() to debug
Matt Bennett [Wed, 23 Sep 2015 04:58:31 +0000 (16:58 +1200)]
ip6_gre: Reduce log level in ip6gre_err() to debug

Currently error log messages in ip6gre_err are printed at 'warn'
level. This is different to most other tunnel types which don't
print any messages. These log messages don't provide any information
that couldn't be deduced with networking tools. Also it can be annoying
to have one end of the tunnel go down and have the logs fill with
pointless messages such as "Path to destination invalid or inactive!".

This patch reduces the log level of these messages to 'dbg' level to
bring the visible behaviour into line with other tunnel types.

Signed-off-by: Matt Bennett <matt.bennett@alliedtelesis.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agofib_rules: fix fib rule dumps across multiple skbs
Wilson Kok [Wed, 23 Sep 2015 04:40:22 +0000 (21:40 -0700)]
fib_rules: fix fib rule dumps across multiple skbs

dump_rules returns skb length and not error.
But when family == AF_UNSPEC, the caller of dump_rules
assumes that it returns an error. Hence, when family == AF_UNSPEC,
we continue trying to dump on -EMSGSIZE errors resulting in
incorrect dump idx carried between skbs belonging to the same dump.
This results in fib rule dump always only dumping rules that fit
into the first skb.

This patch fixes dump_rules to return error so that we exit correctly
and idx is correctly maintained between skbs that are part of the
same dump.

Signed-off-by: Wilson Kok <wkok@cumulusnetworks.com>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
8 years agoPCI: rcar: Add R8A7794 support
Sergei Shtylyov [Fri, 11 Sep 2015 23:06:09 +0000 (02:06 +0300)]
PCI: rcar: Add R8A7794 support

Add Renesas R8A7794 SoC support to the Renesas R-Car gen2 PCI driver.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
8 years agoPCI: Use function 0 VPD for identical functions, regular VPD for others
Alex Williamson [Wed, 16 Sep 2015 04:24:46 +0000 (22:24 -0600)]
PCI: Use function 0 VPD for identical functions, regular VPD for others

932c435caba8 ("PCI: Add dev_flags bit to access VPD through function 0")
added PCI_DEV_FLAGS_VPD_REF_F0.  Previously, we set the flag on every
non-zero function of quirked devices.  If a function turned out to be
different from function 0, i.e., it had a different class, vendor ID, or
device ID, the flag remained set but we didn't make VPD accessible at all.

Flip this around so we only set PCI_DEV_FLAGS_VPD_REF_F0 for functions that
are identical to function 0, and allow regular VPD access for any other
functions.

[bhelgaas: changelog, stable tag]
Fixes: 932c435caba8 ("PCI: Add dev_flags bit to access VPD through function 0")
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Acked-by: Myron Stowe <myron.stowe@redhat.com>
Acked-by: Mark Rustad <mark.d.rustad@intel.com>
CC: stable@vger.kernel.org
8 years agoPCI: Fix devfn for VPD access through function 0
Alex Williamson [Tue, 15 Sep 2015 17:17:21 +0000 (11:17 -0600)]
PCI: Fix devfn for VPD access through function 0

Commit 932c435caba8 ("PCI: Add dev_flags bit to access VPD through function
0") passes PCI_SLOT(devfn) for the devfn parameter of pci_get_slot().
Generally this works because we're fairly well guaranteed that a PCIe
device is at slot address 0, but for the general case, including
conventional PCI, it's incorrect.  We need to get the slot and then convert
it back into a devfn.

Fixes: 932c435caba8 ("PCI: Add dev_flags bit to access VPD through function 0")
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Acked-by: Myron Stowe <myron.stowe@redhat.com>
Acked-by: Mark Rustad <mark.d.rustad@intel.com>
CC: stable@vger.kernel.org
8 years agoPCI/MSI: Fix MSI IRQ domains for VFs on virtual buses
Alex Williamson [Fri, 18 Sep 2015 21:08:54 +0000 (15:08 -0600)]
PCI/MSI: Fix MSI IRQ domains for VFs on virtual buses

SR-IOV creates a virtual bus where bus->self is NULL.  When we add VFs and
scan for an MSI domain, pci_set_bus_msi_domain() dereferences bus->self,
which causes a kernel NULL pointer dereference oops.

Scan up to the parent bus until we find a real bridge where we can get the
MSI domain.

[bhelgaas: changelog]
Fixes: 44aa0c657e3e ("PCI/MSI: Add hooks to populate the msi_domain field")
Tested-by: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
8 years agoMAINTAINERS: The docs tree has moved
Jonathan Corbet [Thu, 24 Sep 2015 22:05:28 +0000 (16:05 -0600)]
MAINTAINERS: The docs tree has moved

For years I've waited in vain for Linus to see the error of his ways and go
back to our beloved 2.6.x naming scheme.  But dispair has overtaken me at
last, so, with a heavy heart, I'm moving my repo to a more contemporary
name.  My kids will be proud of me.