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

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

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 8 Oct 2020 22:44:50 +0000 (15:44 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 8 Oct 2020 22:44:50 +0000 (15:44 -0700)
commit	7d3d9f81354b015f19b0c1b1cdbc3c7f44c963ea
tree	c878d774db35fdb9834621e2f354973dc09f2702	tree \| snapshot
parent	e324f23a5162f0ce25790422bd7a9581999027cc	commit \| diff
parent	24bf41fff1b030df979eb79bb05638b1b307bf9c	commit \| diff

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

Small conflict around locking in rxrpc_process_event() -
channel_lock moved to bundle in next, while state lock
needs _bh() from net.

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

19 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/felix_vsc9959.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/seville_vsc9953.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot_vsc7514.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/options.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/conntrack.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/ar-internal.h	diff1 \|	diff2 \|	blob \| history
net/rxrpc/call_object.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/conn_event.c	diff1 \|	diff2 \|	blob \| history
net/sctp/auth.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/felix_vsc9959.c	diff1 \|	diff2 \|	blob \| history
drivers/net/dsa/ocelot/seville_vsc9953.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mscc/ocelot_vsc7514.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macsec.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/options.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/conntrack.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/ar-internal.h	diff1 \|	diff2 \|	blob \| history
net/rxrpc/call_object.c	diff1 \|	diff2 \|	blob \| history
net/rxrpc/conn_event.c	diff1 \|	diff2 \|	blob \| history
net/sctp/auth.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history