git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1a147b7 7111951)

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	f0b5989745c3e0e92424d36869a97e4e8df7ab13
tree	0e9759b9d6060bb94cad676b1b16e423d5ad2523	tree \| snapshot
parent	1a147b74c2fd4058dea0133cb2471724c3b3de09	commit \| diff
parent	7111951b8d4973bda27ff663f2cf18b663d15b48	commit \| diff

Merge git://git./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

John Crispins staging tree