]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e663c05 2c63b5e)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 23 Jul 2015 07:41:16 +0000 (00:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 Jul 2015 07:41:16 +0000 (00:41 -0700)
commitd3c48c8c5492d10f44c9b215fda29a57a0a7dea4
tree007da00e75e9b84766ac4868421705300e1e2e14tree | snapshot
parente663c0534090a21ea086ce40281a017c6f1ce60fcommit | diff
parent2c63b5e2e6b744aa837f7e62a7134250e523d3c2commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
net/bridge/br_mdb.c

br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 files changed:
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/dsa/bcm_sf2.c diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvneta.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/usb/qmi_wwan.c diff1 | diff2 | blob | history
net/bridge/br_mdb.c diff1 | diff2 | blob | history
net/bridge/br_multicast.c diff1 | diff2 | blob | history
net/core/dst.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/ipv4/inet_hashtables.c diff1 | diff2 | blob | history
net/ipv4/ip_fragment.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv6/datagram.c diff1 | diff2 | blob | history
net/openvswitch/flow_table.c diff1 | diff2 | blob | history
net/sched/act_bpf.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.