tree 8652f27f158984e5aa4c00ddf1a4885a32435f28
parent 7f460d30c8e130382de1443fdbc4d040a9e062ec
parent 110bc76729d448fdbcb5cdb63b83d9fd65ce5e26
author David S. Miller <davem@davemloft.net> 1431541903 -0400
committer David S. Miller <davem@davemloft.net> 1431541903 -0400

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: David S. Miller <davem@davemloft.net>