OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9f32c27
bf3e762
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
author
Jakub Kicinski
<kuba@kernel.org>
Sat, 7 Nov 2020 01:32:55 +0000
(17:32 -0800)
committer
Jakub Kicinski
<kuba@kernel.org>
Sat, 7 Nov 2020 01:33:38 +0000
(17:33 -0800)
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
14 files changed:
1
2
Documentation/admin-guide/index.rst
patch
|
diff1
|
diff2
|
blob
|
history
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/cadence/macb_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/realtek/r8169_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/phy.h
patch
|
diff1
|
diff2
|
blob
|
history
lib/Kconfig.debug
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/netfilter/nf_reject_ipv4.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/ip6_tunnel.c
patch
|
diff1
|
diff2
|
blob
|
history
net/netfilter/ipset/ip_set_core.c
patch
|
diff1
|
diff2
|
blob
|
history
net/netfilter/nf_tables_api.c
patch
|
diff1
|
diff2
|
blob
|
history
net/smc/smc_clc.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/admin-guide/index.rst
Simple merge
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/net/ethernet/cadence/macb_main.c
Simple merge
diff --cc
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c
Simple merge
diff --cc
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
Simple merge
diff --cc
drivers/net/ethernet/realtek/r8169_main.c
Simple merge
diff --cc
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge
diff --cc
include/linux/phy.h
Simple merge
diff --cc
lib/Kconfig.debug
Simple merge
diff --cc
net/ipv4/netfilter/nf_reject_ipv4.c
Simple merge
diff --cc
net/ipv6/ip6_tunnel.c
Simple merge
diff --cc
net/netfilter/ipset/ip_set_core.c
Simple merge
diff --cc
net/netfilter/nf_tables_api.c
Simple merge
diff --cc
net/smc/smc_clc.h
Simple merge