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

..

j1939

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

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

af_can.c

net: introduce CAN specific pointer in the struct net_device

2021-02-24 14:32:15 -08:00

af_can.h

can: introduce CAN midlayer private and allocate it automatically

2019-09-04 13:29:14 +02:00

bcm.c

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

2021-06-29 15:45:27 -07:00

gw.c

can: gw: synchronize rcu operations before removing gw job entry

2021-06-19 23:53:43 +02:00

isotp.c

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

2021-06-29 15:45:27 -07:00

Kconfig

net: remove redundant 'depends on NET'

2021-01-27 17:04:12 -08:00

Makefile

can: add ISO 15765-2:2016 transport protocol

2020-10-07 23:18:33 +02:00

proc.c

can: proc: remove unnecessary variables

2021-05-27 09:42:21 +02:00

raw.c

can: raw: raw_setsockopt(): fix raw_rcv panic for sock UAF

2021-07-24 19:00:14 +02:00