]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc6c6e5 fa7902e)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Jun 2019 04:06:39 +0000 (21:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Jun 2019 04:06:39 +0000 (21:06 -0700)
commit35fd64881bb58a6aa3c3016168d4846cc84a9225
tree46b6d010a9a4dfe96dc86339d1cbded8874c6b8ftree | snapshot
parentdc6c6e59aae49f4af81e78680819777d45416b87commit | diff
parentfa7902ea6172f9e92eadb97396335915efb30dd5commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.

In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.

The aquantia driver conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
25 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/dsa/microchip/ksz_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/aq_filters.c diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/aq_nic.c diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/aq_nic.h diff1 | diff2 | blob | history
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/team/team.c diff1 | diff2 | blob | history
drivers/net/vrf.c diff1 | diff2 | blob | history
drivers/scsi/qedi/qedi_main.c diff1 | diff2 | blob | history
fs/afs/internal.h diff1 | diff2 | blob | history
include/net/ip6_route.h diff1 | diff2 | blob | history
include/net/route.h diff1 | diff2 | blob | history
include/net/tls.h diff1 | diff2 | blob | history
net/ipv4/ip_output.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
net/packet/internal.h diff1 | diff2 | blob | history
net/smc/af_smc.c diff1 | diff2 | blob | history
net/tipc/netlink_compat.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.