Jakub Kicinski d2e11fd2b7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Conflicting commits, all resolutions pretty trivial:

drivers/bus/mhi/pci_generic.c
  5c2c853159 ("bus: mhi: pci-generic: configurable network interface MRU")
  56f6f4c4eb ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean")

drivers/nfc/s3fwrn5/firmware.c
  a0302ff590 ("nfc: s3fwrn5: remove unnecessary label")
  46573e3ab0 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")
  801e541c79 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")

MAINTAINERS
  7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver")
  8a7b46fa79 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2021-07-31 09:14:46 -07:00

..

i40e_adminq_cmd.h

i40e: Fix PHY type identifiers for 2.5G and 5G adapters

2021-05-07 09:35:49 -07:00

i40e_adminq.c

i40e: Allow changing FEC settings on X722 if supported by FW

2020-10-13 19:44:01 -07:00

i40e_adminq.h

intel-ethernet: clean up W=1 warnings in kdoc

2020-09-25 16:28:59 -07:00

i40e_alloc.h

…

i40e_client.c

RDMA/irdma: Add irdma Kconfig/Makefile and remove i40iw

2021-06-02 20:06:36 -03:00

i40e_common.c

i40e: clean up packet type lookup table

2021-06-18 09:04:44 -07:00

i40e_dcb_nl.c

intel: clean up mismatched header comments

2021-03-23 11:34:02 -07:00

i40e_dcb.c

intel: clean up mismatched header comments

2021-03-23 11:34:02 -07:00

i40e_dcb.h

i40e: Add hardware configuration for software based DCB

2021-02-10 14:28:39 -08:00

i40e_ddp.c

intel: clean up mismatched header comments

2021-03-23 11:34:02 -07:00

i40e_debugfs.c

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

2021-04-09 20:48:35 -07:00

i40e_devids.h

i40e: Add support for 5Gbps cards

2020-06-25 22:25:13 -07:00

i40e_diag.c

…

i40e_diag.h

…

i40e_ethtool.c

i40e: Add additional info to PHY type error

2021-07-23 07:44:48 -07:00

i40e_hmc.c

i40e: Implement debug macro hw_dbg using dev_dbg

2019-09-09 11:22:20 -07:00

i40e_hmc.h

i40e: remove unused defines

2020-06-25 22:25:13 -07:00

i40e_lan_hmc.c

intel: clean up mismatched header comments

2021-03-23 11:34:02 -07:00

i40e_lan_hmc.h

…

i40e_main.c

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

2021-07-31 09:14:46 -07:00

i40e_nvm.c

intel: clean up mismatched header comments

2021-03-23 11:34:02 -07:00

i40e_osdep.h

i40e: remove unused defines

2020-06-25 22:25:13 -07:00

i40e_prototype.h

i40e: Add hardware configuration for software based DCB

2021-02-10 14:28:39 -08:00

i40e_ptp.c

i40e: add support for PTP external synchronization clock

2021-07-21 08:53:54 -07:00

i40e_register.h

i40e: add support for PTP external synchronization clock

2021-07-21 08:53:54 -07:00

i40e_status.h

…

i40e_trace.h

intel-ethernet: clean up W=1 warnings in kdoc

2020-09-25 16:28:59 -07:00

i40e_txrx_common.h

intel-ethernet: clean up W=1 warnings in kdoc

2020-09-25 16:28:59 -07:00

i40e_txrx.c

i40e: Fix queue-to-TC mapping on Tx

2021-07-23 07:44:48 -07:00

i40e_txrx.h

i40e: Fix queue-to-TC mapping on Tx

2021-07-23 07:44:48 -07:00

i40e_type.h

i40e: clean up packet type lookup table

2021-06-18 09:04:44 -07:00

i40e_virtchnl_pf.c

i40e: improve locking of mac_filter_hash

2021-07-19 09:18:30 -07:00

i40e_virtchnl_pf.h

i40e: Revert "i40e: don't report link up for a VF who hasn't enabled queues"

2021-02-01 13:18:31 -08:00

i40e_xsk.c

intel: Remove rcu_read_lock() around XDP program invocation

2021-06-24 19:44:34 +02:00

i40e_xsk.h

i40e: Use batched xsk Tx interfaces to increase performance

2020-11-17 22:07:40 +01:00

i40e.h

i40e: add support for PTP external synchronization clock

2021-07-21 08:53:54 -07:00

Makefile

i40e: Implement DDP support in i40e driver

2019-04-16 15:10:21 -07:00