]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dd82a9b ce58ef7)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 3 Nov 2015 18:41:45 +0000 (13:41 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Nov 2015 18:41:45 +0000 (13:41 -0500)
commit7e1013c215b348d60483044ea24bfafe62f56a04
tree9e6ed2c499cb5cbbcc79415602f9114503bb6931tree | snapshot
parentdd82a9b4d5fe313dcaf670c22741dd7066de2855commit | diff
parentce58ef70984f2131b9e43d692d718bdaa1726a8ecommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
drivers/net/ethernet/broadcom/genet/bcmgenet.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/genet/bcmgenet.h diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fec_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/ef10.c diff1 | diff2 | blob | history
drivers/net/ethernet/sfc/net_driver.h diff1 | diff2 | blob | history
drivers/net/phy/phy_device.c diff1 | diff2 | blob | history
drivers/net/usb/qmi_wwan.c diff1 | diff2 | blob | history
include/net/ip_fib.h diff1 | diff2 | blob | history
net/ipv4/fib_frontend.c diff1 | diff2 | blob | history
net/ipv4/fib_semantics.c diff1 | diff2 | blob | history
net/ipv4/ipmr.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/tipc/udp_media.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.