projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 91163f8 7f376f1)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Sat, 12 Dec 2020 04:12:36 +0000 (20:12 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 12 Dec 2020 06:29:38 +0000 (22:29 -0800)
commit46d5e62dd3c34770f3bfd0642daa9a7772a00362
tree72f00a33d177cae0c8c9d7337ced3a6c6bbad45dtree | snapshot
parent91163f82143630a9629a8bf0227d49173697c69ccommit | diff
parent7f376f1917d7461e05b648983e8d2aea9d0712b2commit | diff
Merge git://git./linux/kernel/git/netdev/net

xdp_return_frame_bulk() needs to pass a xdp_buff
to __xdp_return().

strlcpy got converted to strscpy but here it makes no
functional difference, so just keep the right code.

Conflicts:
net/netfilter/nf_tables_api.c

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
52 files changed:
CREDITS diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/can/softing/softing_main.c diff1 | diff2 | blob | history
drivers/net/dsa/ocelot/felix.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/enetc/enetc_hw.h diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_txrx.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_txrx.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/igb/igb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/prestera/prestera_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/en_tx.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/mscc/ocelot.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/cpsw_priv.c diff1 | diff2 | blob | history
drivers/net/geneve.c diff1 | diff2 | blob | history
drivers/net/netdevsim/netdevsim.h diff1 | diff2 | blob | history
drivers/net/vrf.c diff1 | diff2 | blob | history
include/linux/security.h diff1 | diff2 | blob | history
include/net/xdp.h diff1 | diff2 | blob | history
include/soc/mscc/ocelot.h diff1 | diff2 | blob | history
include/uapi/linux/bpf.h diff1 | diff2 | blob | history
kernel/bpf/helpers.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
kernel/trace/bpf_trace.c diff1 | diff2 | blob | history
mm/slab.h diff1 | diff2 | blob | history
net/bridge/br_device.c diff1 | diff2 | blob | history
net/bridge/br_multicast.c diff1 | diff2 | blob | history
net/bridge/br_private.h diff1 | diff2 | blob | history
net/bridge/br_vlan.c diff1 | diff2 | blob | history
net/can/isotp.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/xdp.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/tcp_output.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
net/mac80211/iface.c diff1 | diff2 | blob | history
net/mac80211/util.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/netfilter/nft_ct.c diff1 | diff2 | blob | history
net/tipc/node.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
net/xdp/xsk.c diff1 | diff2 | blob | history
net/xdp/xsk_buff_pool.c diff1 | diff2 | blob | history
net/xdp/xsk_queue.h diff1 | diff2 | blob | history
tools/include/uapi/linux/bpf.h diff1 | diff2 | blob | history
Domain: System / Kernel;