* linux-next: manual merge of the net-next tree with the nettree
@ 2016-01-12 2:15 Stephen Rothwell
2016-01-12 9:12 ` Ido Schimmel
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2016-01-12 2:15 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Ido Schimmel, Jiri Pirko
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlxsw/spectrum.h
between commit:
366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving")
from the net tree and commit:
0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index 69281ca534b1,199f91a62962..000000000000
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@@ -63,13 -120,16 +120,17 @@@ struct mlxsw_sp
} fdb_notify;
#define MLXSW_SP_DEFAULT_AGEING_TIME 300
u32 ageing_time;
+ struct mutex fdb_lock; /* Make sure FDB sessions are atomic. */
- struct {
- struct net_device *dev;
- unsigned int ref_count;
- } master_bridge;
+ struct mlxsw_sp_upper master_bridge;
+ struct mlxsw_sp_upper lags[MLXSW_SP_LAG_MAX];
};
+ static inline struct mlxsw_sp_upper *
+ mlxsw_sp_lag_get(struct mlxsw_sp *mlxsw_sp, u16 lag_id)
+ {
+ return &mlxsw_sp->lags[lag_id];
+ }
+
struct mlxsw_sp_port_pcpu_stats {
u64 rx_packets;
u64 rx_bytes;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the nettree
2016-01-12 2:15 linux-next: manual merge of the net-next tree with the nettree Stephen Rothwell
@ 2016-01-12 9:12 ` Ido Schimmel
0 siblings, 0 replies; 2+ messages in thread
From: Ido Schimmel @ 2016-01-12 9:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Jiri Pirko
Tue, Jan 12, 2016 at 04:15:07AM IST, sfr@canb.auug.org.au wrote:
>Hi all,
>
>Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlxsw/spectrum.h
>
>between commit:
>
> 366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving")
>
>from the net tree and commit:
>
> 0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave")
>
>from the net-next tree.
>
>I fixed it up (see below) and can carry the fix as necessary (no action
>is required).
Acked-by: Ido Schimmel <idosch@mellanox.com>
Thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-12 9:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-12 2:15 linux-next: manual merge of the net-next tree with the nettree Stephen Rothwell
2016-01-12 9:12 ` Ido Schimmel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).