David S. Miller c0b458a946 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>

2018-04-01 19:49:34 -04:00

..

.gitignore

[ATM]: Ignore generated file pca200e_ecd.bin2

2006-12-11 14:34:35 -08:00

adummy.c

atm: make atmdev_ops const

2017-08-09 22:43:50 -07:00

ambassador.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-29 13:10:25 -08:00

ambassador.h

ATM: Delete no use FILL_RX_POOLS_IN_BH marco

2011-07-08 09:06:31 -07:00

atmtcp.c

atm: make atmdev_ops const

2017-08-09 22:43:50 -07:00

eni.c

atm: eni: fix several indentation issues

2017-11-30 09:26:32 -05:00

eni.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

firestream.c

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

firestream.h

atm: firestream: remove duplicate define

2013-10-21 18:46:46 -04:00

fore200e.c

atm: fore200e: use %pK to format kernel addresses instead of %x

2017-11-28 16:00:55 -05:00

fore200e.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

he.c

atm: he: use 64-bit arithmetic instead of 32-bit

2018-02-08 15:05:16 -05:00

he.h

atm: remove deprecated use of pci api

2015-01-18 00:28:41 -05:00

horizon.c

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

horizon.h

long vs. unsigned long - low-hanging fruits in drivers

2007-10-14 12:41:51 -07:00

idt77105.c

treewide: Switch DEFINE_TIMER callbacks to struct timer_list *

2017-11-21 15:57:05 -08:00

idt77105.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

idt77252_tables.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

idt77252.c

atm: idt77252: remove redundant bit-wise or'ing of zero

2018-02-23 12:42:26 -05:00

idt77252.h

atm: idt77252: Convert timers to use timer_setup()

2017-10-18 12:39:38 +01:00

iphase.c

atm: iphase: fix spelling mistake: "Receiverd" -> "Received"

2018-03-30 10:10:04 -04:00

iphase.h

scripts/spelling.txt: add "followings" pattern and fix typo instances

2017-02-27 18:43:47 -08:00

Kconfig

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

lanai.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-29 13:10:25 -08:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

midway.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

nicstar.c

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

nicstar.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

nicstarmac.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

nicstarmac.copyright

drivers/atm/: remove CVS keywords

2008-05-20 14:52:25 -07:00

solos-attrlist.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

solos-pci.c

atm: make atmdev_ops const

2017-08-09 22:43:50 -07:00

suni.c

atm: suni: remove extraneous space to fix indentation

2017-11-28 16:03:09 -05:00

suni.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

tonga.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

uPD98401.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

uPD98402.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

uPD98402.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

zatm.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-07-21 03:38:43 +01:00

zatm.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

zeprom.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00