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

Commit 14591433 authored Nov 21, 2014 by David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net



Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

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

parents 53b15ef3 8a84e01e

Documentation/devicetree/bindings/ata/sata_rcar.txt

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3,8 +3,10 @@
	Required properties:		Required properties:
	- compatible : should contain one of the following:		- compatible : should contain one of the following:
	- "renesas,sata-r8a7779" for R-Car H1		- "renesas,sata-r8a7779" for R-Car H1
	- "renesas,sata-r8a7790" for R-Car H2		- "renesas,sata-r8a7790-es1" for R-Car H2 ES1
	- "renesas,sata-r8a7791" for R-Car M2		- "renesas,sata-r8a7790" for R-Car H2 other than ES1
			- "renesas,sata-r8a7791" for R-Car M2-W
			- "renesas,sata-r8a7793" for R-Car M2-N
	- reg : address and length of the SATA registers;		- reg : address and length of the SATA registers;
	- interrupts : must consist of one interrupt specifier.		- interrupts : must consist of one interrupt specifier.

Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -30,10 +30,6 @@ should only be used when a device has multiple interrupt parents.
	Example:		Example:
	interrupts-extended = <&intc1 5 1>, <&intc2 1 0>;		interrupts-extended = <&intc1 5 1>, <&intc2 1 0>;

	A device node may contain either "interrupts" or "interrupts-extended", but not
	both. If both properties are present, then the operating system should log an
	error and use only the data in "interrupts".

	2) Interrupt controller nodes		2) Interrupt controller nodes
	-----------------------------		-----------------------------

Documentation/devicetree/bindings/pci/pci.txt

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,3 +7,14 @@ And for the interrupt mapping part:

	Open Firmware Recommended Practice: Interrupt Mapping		Open Firmware Recommended Practice: Interrupt Mapping
	http://www.openfirmware.org/1275/practice/imap/imap0_9d.pdf		http://www.openfirmware.org/1275/practice/imap/imap0_9d.pdf

			Additionally to the properties specified in the above standards a host bridge
			driver implementation may support the following properties:

			- linux,pci-domain:
			If present this property assigns a fixed PCI domain number to a host bridge,
			otherwise an unstable (across boots) unique number will be assigned.
			It is required to either not set this property at all or set it for all
			host bridges in the system, otherwise potentially conflicting domain numbers
			may be assigned to root buses behind different host bridges. The domain
			number for each host bridge in the system must be unique.

Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
	common pinctrl bindings used by client devices, including the meaning of the		common pinctrl bindings used by client devices, including the meaning of the
	phrase "pin configuration node".		phrase "pin configuration node".

	TZ1090-PDC's pin configuration nodes act as a container for an abitrary number		TZ1090-PDC's pin configuration nodes act as a container for an arbitrary number
	of subnodes. Each of these subnodes represents some desired configuration for a		of subnodes. Each of these subnodes represents some desired configuration for a
	pin, a group, or a list of pins or groups. This configuration can include the		pin, a group, or a list of pins or groups. This configuration can include the
	mux function to select on those pin(s)/group(s), and various pin configuration		mux function to select on those pin(s)/group(s), and various pin configuration

Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the
	common pinctrl bindings used by client devices, including the meaning of the		common pinctrl bindings used by client devices, including the meaning of the
	phrase "pin configuration node".		phrase "pin configuration node".

	TZ1090's pin configuration nodes act as a container for an abitrary number of		TZ1090's pin configuration nodes act as a container for an arbitrary number of
	subnodes. Each of these subnodes represents some desired configuration for a		subnodes. Each of these subnodes represents some desired configuration for a
	pin, a group, or a list of pins or groups. This configuration can include the		pin, a group, or a list of pins or groups. This configuration can include the
	mux function to select on those pin(s)/group(s), and various pin configuration		mux function to select on those pin(s)/group(s), and various pin configuration