projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8fbb89c 272911b)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 15 May 2016 17:32:12 +0000 (13:32 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 May 2016 17:32:48 +0000 (13:32 -0400)
commit909b27f706433a0b3dff79aa259de63aafe40a42
treec13cda633379cdbef701e730027b6a19ba6b267etree | snapshot
parent8fbb89c6fbfd1cda9ae413cd1e042837a8edbdebcommit | diff
parent272911b889f47aa5bc3e004804fc2382f0ac6ce6commit | diff
Merge git://git./linux/kernel/git/davem/net

The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
drivers/net/wireless/intel/iwlwifi/mvm/tx.c
net/ipv4/ip_gre.c
net/netfilter/nf_conntrack_core.c

Signed-off-by: David S. Miller <davem@davemloft.net>
25 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/apm/xgene/xgene_enet_cle.c diff1 | diff2 | blob | history
drivers/net/ethernet/apm/xgene/xgene_enet_cle.h diff1 | diff2 | blob | history
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/apm/xgene/xgene_enet_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/apm/xgene/xgene_enet_main.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.h diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/ravb_main.c diff1 | diff2 | blob | history
drivers/net/phy/phy.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/tx.c diff1 | diff2 | blob | history
kernel/events/core.c diff1 | diff2 | blob | history
net/ipv4/fib_semantics.c diff1 | diff2 | blob | history
net/ipv4/ip_gre.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_core.c diff1 | diff2 | blob | history
net/netfilter/nfnetlink_acct.c diff1 | diff2 | blob | history
net/openvswitch/conntrack.c diff1 | diff2 | blob | history
net/sched/act_ife.c diff1 | diff2 | blob | history
net/sched/act_ipt.c diff1 | diff2 | blob | history
net/sched/act_mirred.c diff1 | diff2 | blob | history
net/sched/act_simple.c diff1 | diff2 | blob | history
net/sched/act_skbedit.c diff1 | diff2 | blob | history
net/sched/act_vlan.c diff1 | diff2 | blob | history
John Crispins staging tree