diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-02 02:49:34 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-02 02:49:34 +0300 |
| commit | c0b458a9463bd6be165374a8e9e3235800ee132e (patch) | |
| tree | a96c6393749ab231c6dda8c62683493bd1c66070 /drivers/atm | |
| parent | 859a59352e926315b6384c5fd895b00a30659a12 (diff) | |
| parent | b5dbc28762fd3fd40ba76303be0c7f707826f982 (diff) | |
| download | linux-c0b458a9463bd6be165374a8e9e3235800ee132e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:
1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE
2) In 'net-next' params->log_rq_size is renamed to be
params->log_rq_mtu_frames.
3) In 'net-next' params->hard_mtu is added.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/iphase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 98a3a43484c8..44abb8a0a5e5 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c @@ -3147,7 +3147,7 @@ static int ia_proc_read(struct atm_dev *dev,loff_t *pos,char *page) " Size of Tx Buffer : %u\n" " Number of Rx Buffer: %u\n" " Size of Rx Buffer : %u\n" - " Packets Receiverd : %u\n" + " Packets Received : %u\n" " Packets Transmitted: %u\n" " Cells Received : %u\n" " Cells Transmitted : %u\n" |