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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 00:32:01 +0000 (11:32 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 00:32:01 +0000 (11:32 +1100)
commit	4f19ad81d151f7b1fdcce020e3d968c9ffe17676
tree	c95108bc6c5006ae395867282028f7b93b66a3d2	tree
parent	0a38c83a13a8055ad4098cbff0b4ba641ba6a419	commit \| diff
parent	0b9e69e1a1e4d60473486d15217845ae1e151d4a	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/netdev/net-next.git

# Conflicts:
# drivers/hwmon/adt7310.c

29 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/xilinx/zynqmp.dtsi	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/iavf/iavf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/sc16is7xx.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/linux/sunrpc/svc_xprt.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci_core.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/mgmt.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/bpf_trace.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_sync.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/auth_gss.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/svc_xprt.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprt.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/Makefile	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/perf/util/bpf-loader.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_connect.sh	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/xilinx/zynqmp.dtsi	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ibmvnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/iavf/iavf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/sc16is7xx.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/linux/sunrpc/svc_xprt.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci_core.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/mgmt.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/bpf_trace.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_sync.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/smc/af_smc.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/auth_gss.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/svc_xprt.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprt.c	diff1 \|	diff2 \|	blob \| history
net/xdp/xsk.c	diff1 \|	diff2 \|	blob \| history
tools/bpf/bpftool/Makefile	diff1 \|	diff2 \|	blob \| history
tools/lib/bpf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/perf/util/bpf-loader.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_connect.sh	diff1 \|	diff2 \|	blob \| history