GitLab

Conflicting commits, all resolutions pretty trivial:

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

drivers/nfc/s3fwrn5/firmware.c
  a0302ff5 ("nfc: s3fwrn5: remove unnecessary label")
  46573e3a ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")
  801e541c ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")

MAINTAINERS
  7d901a1e ("net: phy: add Maxlinear GPY115/21x/24x driver")
  8a7b46fa

 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>