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

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

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6c0278d 38b949f)

author	David S. Miller <davem@davemloft.net>
	Mon, 30 Mar 2020 04:25:29 +0000 (21:25 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 30 Mar 2020 04:25:29 +0000 (21:25 -0700)
commit	b2122fcccf0cac3ad96e4308b33b47ceefb94db2
tree	0e9759b9d6060bb94cad676b1b16e423d5ad2523	tree \| snapshot
parent	6c0278d69b693cedd828bb8a0c67c1a844b6386d	commit \| diff
parent	38b949f99f223acf8fbefc606d013dc80504b63b	commit \| diff

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

Minor comment conflict in mac80211.

Signed-off-by: David S. Miller <davem@davemloft.net>

17 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/riscv/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
include/linux/bpf.h	diff1 \|	diff2 \|	blob \| history
include/linux/ieee80211.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/btf.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_sta.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.