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:
7b22a77
9c982e8
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
author
David S. Miller
<davem@davemloft.net>
Thu, 31 Dec 2015 23:20:10 +0000
(18:20 -0500)
committer
David S. Miller
<davem@davemloft.net>
Thu, 31 Dec 2015 23:20:10 +0000
(18:20 -0500)
18 files changed:
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
crypto/algif_skcipher.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/emulex/benet/be.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/emulex/benet/be_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/renesas/sh_eth.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/ti/cpsw.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/geneve.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/usb/cdc_ncm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/intel/iwlwifi/iwl-7000.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/rhashtable.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bridge/br_stp_if.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv4/ipip.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/addrconf.c
patch
|
diff1
|
diff2
|
blob
|
history
net/openvswitch/conntrack.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sctp/socket.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
crypto/algif_skcipher.c
Simple merge
diff --cc
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge
diff --cc
drivers/net/ethernet/emulex/benet/be.h
Simple merge
diff --cc
drivers/net/ethernet/emulex/benet/be_main.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
Simple merge
diff --cc
drivers/net/ethernet/renesas/sh_eth.c
Simple merge
diff --cc
drivers/net/ethernet/ti/cpsw.c
Simple merge
diff --cc
drivers/net/geneve.c
Simple merge
diff --cc
drivers/net/usb/cdc_ncm.c
Simple merge
diff --cc
drivers/net/wireless/intel/iwlwifi/iwl-7000.c
Simple merge
diff --cc
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
Simple merge
diff --cc
lib/rhashtable.c
Simple merge
diff --cc
net/bridge/br_stp_if.c
index
775e00f
,
12045de
..
905cedd
---
1
/
net/bridge/br_stp_if.c
---
2
/
net/bridge/br_stp_if.c
+++ b/
net/bridge/br_stp_if.c
@@@
-37,10
-37,9
+37,10
@@@
static inline port_id br_make_port_id(_
void br_init_port(struct net_bridge_port *p)
{
struct switchdev_attr attr = {
+ .orig_dev = p->dev,
.id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,
.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP | SWITCHDEV_F_DEFER,
- .u.ageing_time =
p->br->ageing_time
,
+ .u.ageing_time =
jiffies_to_clock_t(p->br->ageing_time)
,
};
int err;
diff --cc
net/ipv4/ipip.c
Simple merge
diff --cc
net/ipv6/addrconf.c
Simple merge
diff --cc
net/openvswitch/conntrack.c
Simple merge
diff --cc
net/sctp/socket.c
Simple merge