Commit b0df0b25 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next 

Backmerge Linus master to get the connector locking revert.

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: (645 commits)
  sysctl: fix proc_doulongvec_ms_jiffies_minmax()
  Revert "drm/probe-helpers: Drop locking from poll_enable"
  MAINTAINERS: add Dan Streetman to zbud maintainers
  MAINTAINERS: add Dan Streetman to zswap maintainers
  mm: do not export ioremap_page_range symbol for external module
  mn10300: fix build error of missing fpu_save()
  romfs: use different way to generate fsid for BLOCK or MTD
  frv: add missing atomic64 operations
  mm, page_alloc: fix premature OOM when racing with cpuset mems update
  mm, page_alloc: move cpuset seqcount checking to slowpath
  mm, page_alloc: fix fast-path race with cpuset update or removal
  mm, page_alloc: fix check for NULL preferred_zone
  kernel/panic.c: add missing \n
  fbdev: color map copying bounds checking
  frv: add atomic64_add_unless()
  mm/mempolicy.c: do not put mempolicy before using its nodemask
  radix-tree: fix private list warnings
  Documentation/filesystems/proc.txt: add VmPin
  mm, memcg: do not retry precharge charges
  proc: add a schedule point in proc_pid_readdir()
  ...
parents f0493e65 ff9f8a7c

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 
Rudolf Marek <R.Marek@sh.cvut.cz>

Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sarangdhar Joshi <spjoshi@codeaurora.org>

Sam Ravnborg <sam@mars.ravnborg.org>

Santosh Shilimkar <ssantosh@kernel.org>

Santosh Shilimkar <santosh.shilimkar@oracle.org>
@@ -150,10 +151,13 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> 
Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

Subhash Jadavani <subhashj@codeaurora.org>

Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>

Sumit Semwal <sumit.semwal@ti.com>

Tejun Heo <htejun@gmail.com>

Thomas Graf <tgraf@suug.ch>

Thomas Pedersen <twp@codeaurora.org>

Tony Luck <tony.luck@intel.com>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Documentation/ABI/testing/sysfs-devices-deferred_probe

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
What:		/sys/devices/.../deferred_probe

Date:		August 2016

Contact:	Ben Hutchings <ben.hutchings@codethink.co.uk>

Description:

		The /sys/devices/.../deferred_probe attribute is

		present for all devices.  If a driver detects during

		probing a device that a related device is not yet

		ready, it may defer probing of the first device.  The

		kernel will retry probing the first device after any

		other device is successfully probed.  This attribute

		reads as 1 if probing of this device is currently

		deferred, or 0 otherwise.

Documentation/devicetree/bindings/i2c/i2c.txt

+8 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ wants to support one of the below features, it should adapt the bindings below. 
	"irq" and "wakeup" names are recognized by I2C core, other names are

	left to individual drivers.



- host-notify

	device uses SMBus host notify protocol instead of interrupt line.



- multi-master

	states that there is another master active on this bus. The OS can use

	this information to adapt power management to keep the arbitration awake
@@ -81,6 +84,11 @@ Binding may contain optional "interrupts" property, describing interrupts 
used by the device. I2C core will assign "irq" interrupt (or the very first

interrupt if not using interrupt names) as primary interrupt for the slave.



Alternatively, devices supporting SMbus Host Notify, and connected to

adapters that support this feature, may use "host-notify" property. I2C

core will create a virtual interrupt for Host Notify and assign it as

primary interrupt for the slave.



Also, if device is marked as a wakeup source, I2C core will set up "wakeup"

interrupt for the device. If "wakeup" interrupt name is not present in the

binding, then primary interrupt will be used as wakeup interrupt.

Documentation/devicetree/bindings/mtd/tango-nand.txt

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Required properties: 
- compatible: "sigma,smp8758-nand"

- reg: address/size of nfc_reg, nfc_mem, and pbus_reg

- dmas: reference to the DMA channel used by the controller

- dma-names: "nfc_sbox"

- dma-names: "rxtx"

- clocks: reference to the system clock

- #address-cells: <1>

- #size-cells: <0>
@@ -17,9 +17,9 @@ Example: 


	nandc: nand-controller@2c000 {

		compatible = "sigma,smp8758-nand";

		reg = <0x2c000 0x30 0x2d000 0x800 0x20000 0x1000>;

		reg = <0x2c000 0x30>, <0x2d000 0x800>, <0x20000 0x1000>;

		dmas = <&dma0 3>;

		dma-names = "nfc_sbox";

		dma-names = "rxtx";

		clocks = <&clkgen SYS_CLK>;

		#address-cells = <1>;

		#size-cells = <0>;

Documentation/devicetree/bindings/net/ti,dp83867.txt

+4 −2
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ 
Required properties:

	- reg - The ID number for the phy, usually a small integer

	- ti,rx-internal-delay - RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID

	- ti,tx-internal-delay - RGMII Transmit Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_TXID

	- ti,fifo-depth - Transmitt FIFO depth- see dt-bindings/net/ti-dp83867.h

		for applicable values

CRA Git | Maintained and supported by SUSTech CRA and CCSE