]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 May 2015 18:31:43 +0000 (14:31 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 May 2015 18:31:43 +0000 (14:31 -0400)
commit5340e9034c3b0566da2f2bd8feb66735ed949121
tree8652f27f158984e5aa4c00ddf1a4885a32435f28
parentdfad1c14311386d2c08c6850d67856b1e6683b61
parent3b051a56eb359919524cbddd80c34760586ab5a3
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>
22 files changed:
arch/arm/net/bpf_jit_32.c
drivers/net/dsa/mv88e6xxx.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/cadence/macb.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/qualcomm/qca_spi.c
drivers/net/ethernet/xilinx/ll_temac_main.c
drivers/net/hyperv/netvsc.c
drivers/net/ppp/pppoe.c
include/linux/netdevice.h
include/net/codel.h
include/net/mac80211.h
net/core/dev.c
net/core/net_namespace.c
net/ipv6/route.c
net/mac80211/iface.c
net/mac80211/sta_info.c
net/netlink/af_netlink.c
net/packet/af_packet.c
net/sched/sch_codel.c
net/sched/sch_fq_codel.c
net/sched/sch_gred.c