git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 28 Oct 2021 17:43:58 +0000 (10:43 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 28 Oct 2021 17:43:58 +0000 (10:43 -0700)
commit	7df621a3eea6761bc83e641aaca6963210c7290d
tree	65ab9d0d1894153ceefcb6b5a1c25b8d17c466fd	tree \| snapshot
parent	f2edaa4ad5d51371709196f2c258fbe875962dee	commit \| diff
parent	411a44c24a561e449b592ff631b7ae321f1eb559	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

include/net/sock.h
  7b50ecfcc6cd ("net: Rename ->stream_memory_read to ->sock_is_readable")
  4c1e34c0dbff ("vsock: Enable y2038 safe timeval for timeout")

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
  0daa55d033b0 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
  e77bcdd1f639 ("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.")

Adjacent code addition in both cases, keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

39 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microchip/lan743x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/nxp/lpc_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/mptcp.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/arraymap.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bridge_loop_avoidance.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/net-sysfs.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/options.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_llc.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/microchip/lan743x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/nxp/lpc_eth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/lan78xx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netfront.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/mptcp.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
include/net/tls.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/arraymap.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/core.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/bridge_loop_avoidance.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/net-sysfs.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/options.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/smc/smc_llc.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_main.c	diff1 \|	diff2 \|	blob \| history
net/tls/tls_sw.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history