projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9faebeb 3fdd47c)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 8 Oct 2020 22:44:50 +0000 (15:44 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 8 Oct 2020 22:44:50 +0000 (15:44 -0700)
commit9d49aea13f1e35869158abe7e314e16dc8f50ff1
treec878d774db35fdb9834621e2f354973dc09f2702tree | snapshot
parent9faebeb2d80065926dfbc09cb73b1bb7779a89cdcommit | diff
parent3fdd47c3b40ac48e6e6e5904cf24d12e6e073a96commit | diff
Merge git://git./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
MicroBlaze GIT Repository