projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b1d95ae dea08e6)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Feb 2016 05:09:14 +0000 (00:09 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Feb 2016 05:09:14 +0000 (00:09 -0500)
commitb633353115e352d3c31c12d4c61978c810f05ea1
tree055174a1b31a3e10fd2c505788fe6487b0028d00tree | snapshot
parentb1d95ae5c5bd3deba84d00c4f83d7d0836b5936fcommit | diff
parentdea08e604408d0303e2332896c5fdd8c1f7d79a2commit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/phy/bcm7xxx.c
drivers/net/phy/marvell.c
drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
52 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/cavium/thunder/nicvf_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/cavium/thunder/nicvf_queues.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/ravb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/netcp_core.c diff1 | diff2 | blob | history
drivers/net/geneve.c diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc_drv.c diff1 | diff2 | blob | history
drivers/net/phy/bcm7xxx.c diff1 | diff2 | blob | history
drivers/net/phy/marvell.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/Kconfig diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/scan.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/pcie/internal.h diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/pcie/rx.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/pcie/trans.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
include/net/ip_tunnels.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
lib/Kconfig.debug diff1 | diff2 | blob | history
net/batman-adv/gateway_client.c diff1 | diff2 | blob | history
net/batman-adv/hard-interface.c diff1 | diff2 | blob | history
net/batman-adv/translation-table.c diff1 | diff2 | blob | history
net/bridge/br_mdb.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/dccp/ipv4.c diff1 | diff2 | blob | history
net/dccp/ipv6.c diff1 | diff2 | blob | history
net/ipv4/devinet.c diff1 | diff2 | blob | history
net/ipv4/inet_connection_sock.c diff1 | diff2 | blob | history
net/ipv4/ip_gre.c diff1 | diff2 | blob | history
net/ipv4/ip_sockglue.c diff1 | diff2 | blob | history
net/ipv4/ip_tunnel.c diff1 | diff2 | blob | history
net/ipv4/ping.c diff1 | diff2 | blob | history
net/ipv4/raw.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/ip6_gre.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
net/netfilter/nfnetlink.c diff1 | diff2 | blob | history
net/sched/sch_api.c diff1 | diff2 | blob | history
net/sctp/socket.c diff1 | diff2 | blob | history
net/tipc/link.c diff1 | diff2 | blob | history
net/tipc/node.c diff1 | diff2 | blob | history
net/unix/af_unix.c diff1 | diff2 | blob | history
John Crispins staging tree