Commit b04096ff authored by David S. Miller's avatar David S. Miller
Browse files

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



Four minor merge conflicts:

1) qca_spi.c renamed the local variable used for the SPI device
   from spi_device to spi, meanwhile the spi_set_drvdata() call
   got moved further up in the probe function.

2) Two changes were both adding new members to codel params
   structure, and thus we had overlapping changes to the
   initializer function.

3) 'net' was making a fix to sk_release_kernel() which is
   completely removed in 'net-next'.

4) In net_namespace.c, the rtnl_net_fill() call for GET operations
   had the command value fixed, meanwhile 'net-next' adjusted the
   argument signature a bit.

This also matches example merge resolutions posted by Stephen
Rothwell over the past two days.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7f460d30 110bc767

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -3709,6 +3709,13 @@ N: Dirk Verworner 
D: Co-author of German book ``Linux-Kernel-Programmierung''

D: Co-founder of Berlin Linux User Group



N: Andrew Victor

E: linux@maxim.org.za

W: http://maxim.org.za/at91_26.html

D: First maintainer of Atmel ARM-based SoC, aka AT91

D: Introduced support for at91rm9200, the first chip of AT91 family

S: South Africa



N: Riku Voipio

E: riku.voipio@iki.fi

D: Author of PCA9532 LED and Fintek f75375s hwmon driver

Documentation/IPMI.txt

+4 −1
Original line number Diff line number Diff line
@@ -505,7 +505,10 @@ at module load time (for a module) with: 


The addresses are normal I2C addresses.  The adapter is the string

name of the adapter, as shown in /sys/class/i2c-adapter/i2c-<n>/name.

It is *NOT* i2c-<n> itself.

It is *NOT* i2c-<n> itself.  Also, the comparison is done ignoring

spaces, so if the name is "This is an I2C chip" you can say

adapter_name=ThisisanI2cchip.  This is because it's hard to pass in

spaces in kernel parameters.



The debug flags are bit flags for each BMC found, they are:

IPMI messages: 1, driver state: 2, timing: 4, I2C probe: 8

Documentation/acpi/enumeration.txt

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ input driver: 
GPIO support

~~~~~~~~~~~~

ACPI 5 introduced two new resources to describe GPIO connections: GpioIo

and GpioInt. These resources are used be used to pass GPIO numbers used by

and GpioInt. These resources can be used to pass GPIO numbers used by

the device to the driver. ACPI 5.1 extended this with _DSD (Device

Specific Data) which made it possible to name the GPIOs among other things.

Documentation/acpi/gpio-properties.txt

+3 −3
Original line number Diff line number Diff line 
_DSD Device Properties Related to GPIO

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



With the release of ACPI 5.1 and the _DSD configuration objecte names

can finally be given to GPIOs (and other things as well) returned by

_CRS.  Previously, we were only able to use an integer index to find

With the release of ACPI 5.1, the _DSD configuration object finally

allows names to be given to GPIOs (and other things as well) returned

by _CRS.  Previously, we were only able to use an integer index to find

the corresponding GPIO, which is pretty error prone (it depends on

the _CRS output ordering, for example).

Documentation/devicetree/bindings/arm/omap/l3-noc.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ provided by Arteris. 
Required properties:

- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family

               Should be "ti,omap4-l3-noc" for OMAP4 family

               Should be "ti,omap5-l3-noc" for OMAP5 family

	       Should be "ti,dra7-l3-noc" for DRA7 family

               Should be "ti,am4372-l3-noc" for AM43 family

- reg:	Contains L3 register address range for each noc domain.

CRA Git | Maintained and supported by SUSTech CRA and CCSE