]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8074751 32d6c0a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Sat, 10 Apr 2021 03:46:01 +0000 (20:46 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 10 Apr 2021 03:48:35 +0000 (20:48 -0700)
commitb23385911058aaf335f2b54e7c3b214043998f32
treebffdd602a7d6ad5060df41789af75965f9d58270tree | snapshot
parent80747517ce2f1ce9640a6d35aaaebea46ea06bd1commit | diff
parent32d6c0a29149f557c8fa25214554f1b9b0d36f50commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Conflicts:

MAINTAINERS
 - keep Chandrasekar
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
 - simple fix + trust the code re-added to param.c in -next is fine
include/linux/bpf.h
 - trivial
include/linux/ethtool.h
 - trivial, fix kdoc while at it
include/linux/skmsg.h
 - move to relevant place in tcp.c, comment re-wrapped
net/core/skmsg.c
 - add the sk = sk // sk = NULL around calls
net/tipc/crypto.c
 - trivial

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
82 files changed:
Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml diff1 | diff2 | blob | history
Documentation/networking/ethtool-netlink.rst diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
arch/x86/net/bpf_jit_comp.c diff1 | diff2 | blob | history
arch/x86/net/bpf_jit_comp32.c diff1 | diff2 | blob | history
drivers/bluetooth/btusb.c diff1 | diff2 | blob | history
drivers/net/can/spi/mcp251x.c diff1 | diff2 | blob | history
drivers/net/can/usb/peak_usb/pcan_usb_core.c diff1 | diff2 | blob | history
drivers/net/dsa/lantiq_gswip.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bcm4908_enet.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_debugfs.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_txrx.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_xsk.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice.h diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_controlq.h diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_dcb.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_switch.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_type.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/dev.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eq.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c diff1 | diff2 | blob | history
drivers/net/ethernet/microchip/lan743x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/flower/main.h diff1 | diff2 | blob | history
drivers/net/ethernet/xilinx/xilinx_axienet.h diff1 | diff2 | blob | history
drivers/net/ethernet/xilinx/xilinx_axienet_main.c diff1 | diff2 | blob | history
drivers/net/geneve.c diff1 | diff2 | blob | history
drivers/net/tun.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
include/linux/avf/virtchnl.h diff1 | diff2 | blob | history
include/linux/bpf.h diff1 | diff2 | blob | history
include/linux/ethtool.h diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
include/linux/skmsg.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
include/uapi/linux/ethtool.h diff1 | diff2 | blob | history
kernel/bpf/disasm.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
kernel/fork.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/core/skmsg.c diff1 | diff2 | blob | history
net/ethtool/ioctl.c diff1 | diff2 | blob | history
net/ipv4/esp4.c diff1 | diff2 | blob | history
net/ipv4/tcp_bpf.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/ip6_vti.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/openvswitch/conntrack.c diff1 | diff2 | blob | history
net/qrtr/qrtr.c diff1 | diff2 | blob | history
net/rds/send.c diff1 | diff2 | blob | history
net/sched/cls_api.c diff1 | diff2 | blob | history
net/tipc/crypto.c diff1 | diff2 | blob | history
net/tipc/net.c diff1 | diff2 | blob | history
net/tipc/node.c diff1 | diff2 | blob | history
net/tipc/socket.c diff1 | diff2 | blob | history
tools/lib/bpf/xsk.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.