git.kernel.dk Git - linux-block.git/commit

projects / linux-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2fc4aa5 2861952)

author	David S. Miller <davem@davemloft.net>
	Wed, 5 Sep 2018 04:33:03 +0000 (21:33 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 5 Sep 2018 04:33:03 +0000 (21:33 -0700)
commit	36302685f59345959de96d0d70a5ad20a3a3451b
tree	778b3170acd1131840823520a4664f2bba343dbe	tree \| snapshot
parent	2fc4aa59ab470f1d5124b33c05680e2b2f2c6f65	commit \| diff
parent	28619527b8a712590c93d0a9e24b4425b9376a8c	commit \| diff

Merge git://git./linux/kernel/git/davem/net

16 files changed:

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_api.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ife.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_pedit.c	diff1 \|	diff2 \|	blob \| history
net/tipc/topsrv.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/map.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)