David S. Miller 4d8773b68e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Minor conflict in mlx5 because changes happened to code that has
moved meanwhile.

Signed-off-by: David S. Miller <davem@davemloft.net>

2020-01-26 10:40:21 +01:00

..

fman_dtsec.c

fsl/fman: add set_tstamp interface

2018-06-26 22:15:14 +09:00

fman_dtsec.h

fsl/fman: add set_tstamp interface

2018-06-26 22:15:14 +09:00

fman_keygen.c

fsl/fman: include IPSEC SPI in the Keygen extraction

2019-05-28 11:21:03 -07:00

fman_keygen.h

fsl/fman: enable FMan Keygen

2017-08-28 16:41:00 -07:00

fman_mac.h

…

fman_memac.c

net: fsl/fman: rename IF_MODE_XGMII to IF_MODE_10G

2020-01-23 21:18:57 +01:00

fman_memac.h

fsl/fman: add set_tstamp interface

2018-06-26 22:15:14 +09:00

fman_muram.c

…

fman_muram.h

…

fman_port.c

fsl/fman: remove unused struct member

2019-10-24 15:21:58 -07:00

fman_port.h

fsl/fman: add API to get the device behind a fman port

2019-10-24 15:21:58 -07:00

fman_sp.c

…

fman_sp.h

…

fman_tgec.c

fsl/fman: Use GFP_ATOMIC in {memac,tgec}_add_hash_mac_address()

2018-12-28 21:54:12 -08:00

fman_tgec.h

fsl/fman: add set_tstamp interface

2018-06-26 22:15:14 +09:00

fman.c

fsl/fman: don't touch liodn base regs reserved on non-PAMU SoCs

2019-10-24 15:21:57 -07:00

fman.h

fsl/fman: define frame description command UPD

2018-06-26 22:15:14 +09:00

Kconfig

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

mac.c

fsl/fman: use resource_size

2020-01-02 16:31:03 -08:00

mac.h

fsl/fman: add set_tstamp interface

2018-06-26 22:15:14 +09:00

Makefile

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

2017-11-04 09:26:51 +09:00