Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'v4.0-rc3' into drm-next 

Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/intel_display.c
parents 8dd0eb35 9eccca08

Documentation/CodeOfConflict

0 → 100644
+27 −0
Original line number Diff line number Diff line 
Code of Conflict

----------------



The Linux kernel development effort is a very personal process compared

to "traditional" ways of developing software.  Your code and ideas

behind it will be carefully reviewed, often resulting in critique and

criticism.  The review will almost always require improvements to the

code before it can be included in the kernel.  Know that this happens

because everyone involved wants to see the best possible solution for

the overall success of Linux.  This development process has been proven

to create the most robust operating system kernel ever, and we do not

want to do anything to cause the quality of submission and eventual

result to ever decrease.



If however, anyone feels personally abused, threatened, or otherwise

uncomfortable due to this process, that is not acceptable.  If so,

please contact the Linux Foundation's Technical Advisory Board at

<tab@lists.linux-foundation.org>, or the individual members, and they

will work to resolve the issue to the best of their ability.  For more

information on who is on the Technical Advisory Board and what their

role is, please see:

	http://www.linuxfoundation.org/programs/advisory-councils/tab



As a reviewer of code, please strive to keep things civil and focused on

the technical issues involved.  We are all humans, and frustrations can

be high on both sides of the process.  Try to keep in mind the immortal

words of Bill and Ted, "Be excellent to each other."

Documentation/cgroups/unified-hierarchy.txt

+2 −2
Original line number Diff line number Diff line
@@ -404,8 +404,8 @@ supported and the interface files "release_agent" and 
  be understood as an underflow into the highest possible value, -2 or

  -10M etc. do not work, so it's not consistent.



  memory.low, memory.high, and memory.max will use the string

  "infinity" to indicate and set the highest possible value.

  memory.low, memory.high, and memory.max will use the string "max" to

  indicate and set the highest possible value.



5. Planned Changes

Documentation/devicetree/bindings/i2c/i2c-imx.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
  - "fsl,vf610-i2c" for I2C compatible with the one integrated on Vybrid vf610 SoC

- reg : Should contain I2C/HS-I2C registers location and length

- interrupts : Should contain I2C/HS-I2C interrupt

- clocks : Should contain the I2C/HS-I2C clock specifier



Optional properties:

- clock-frequency : Constains desired I2C/HS-I2C bus clock frequency in Hz.

Documentation/devicetree/bindings/net/amd-xgbe-phy.txt

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ property is used. 
- amd,serdes-cdr-rate: CDR rate speed selection

- amd,serdes-pq-skew: PQ (data sampling) skew

- amd,serdes-tx-amp: TX amplitude boost

- amd,serdes-dfe-tap-config: DFE taps available to run

- amd,serdes-dfe-tap-enable: DFE taps to enable



Example:

	xgbe_phy@e1240800 {
@@ -41,4 +43,6 @@ Example: 
		amd,serdes-cdr-rate = <2>, <2>, <7>;

		amd,serdes-pq-skew = <10>, <10>, <30>;

		amd,serdes-tx-amp = <15>, <15>, <10>;

		amd,serdes-dfe-tap-config = <3>, <3>, <1>;

		amd,serdes-dfe-tap-enable = <0>, <0>, <127>;

	};

Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt

+16 −0
Original line number Diff line number Diff line
@@ -21,6 +21,18 @@ Optional properties: 
- reg-io-width : the size (in bytes) of the IO accesses that should be

  performed on the device.  If this property is not present then single byte

  accesses are used.

- dcd-override : Override the DCD modem status signal. This signal will always

  be reported as active instead of being obtained from the modem status

  register. Define this if your serial port does not use this pin.

- dsr-override : Override the DTS modem status signal. This signal will always

  be reported as active instead of being obtained from the modem status

  register. Define this if your serial port does not use this pin.

- cts-override : Override the CTS modem status signal. This signal will always

  be reported as active instead of being obtained from the modem status

  register. Define this if your serial port does not use this pin.

- ri-override : Override the RI modem status signal. This signal will always be

  reported as inactive instead of being obtained from the modem status register.

  Define this if your serial port does not use this pin.



Example:
@@ -31,6 +43,10 @@ Example: 
		interrupts = <10>;

		reg-shift = <2>;

		reg-io-width = <4>;

		dcd-override;

		dsr-override;

		cts-override;

		ri-override;

	};



Example with one clock: