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

..

admtek

module: remove never implemented MODULE_SUPPORTED_DEVICE

2021-03-17 13:16:18 -07:00

ath

Merge tag 'mac80211-next-for-net-next-2021-06-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2021-06-28 13:06:12 -07:00

atmel

module: remove never implemented MODULE_SUPPORTED_DEVICE

2021-03-17 13:16:18 -07:00

broadcom

Merge tag 'driver-core-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2021-07-05 13:51:41 -07:00

cisco

airo: use ndo_siocdevprivate

2021-07-27 20:11:44 +01:00

intel

Merge tag 'mac80211-next-for-net-next-2021-06-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2021-06-28 13:06:12 -07:00

intersil

hostap: use ndo_siocdevprivate

2021-07-27 20:11:43 +01:00

marvell

Merge tag 'asm-generic-unaligned-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2021-07-02 12:43:40 -07:00

mediatek

Merge tag 'Wimplicit-fallthrough-clang-5.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

2021-07-15 13:57:31 -07:00

microchip

wilc1000: Fix clock name binding

2021-06-15 16:35:18 +03:00

quantenna

qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth

2021-04-22 17:40:12 +03:00

ralink

rt2x00: do not set timestamp for injected frames

2021-06-15 16:36:20 +03:00

realtek

Merge tag 'mac80211-next-for-net-next-2021-06-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2021-06-28 13:06:12 -07:00

rsi

rsi: fix AP mode with WPA failure due to encrypted EAPOL

2021-06-15 16:42:18 +03:00

st

cw1200: Revert unnecessary patches that fix unreal use-after-free bugs

2021-06-15 16:41:22 +03:00

ti

Merge tag 'driver-core-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2021-07-05 13:51:41 -07:00

zydas

zd1211rw: Prefer pr_err over printk error msg

2021-06-15 16:37:01 +03:00

Kconfig

…

mac80211_hwsim.c

mac80211_hwsim: record stats in non-netlink path

2021-06-23 11:29:13 +02:00

mac80211_hwsim.h

…

Makefile

…

ray_cs.c

…

ray_cs.h

…

rayctl.h

…

rndis_wlan.c

rndis_wlan: simplify is_associated()

2021-06-15 16:34:19 +03:00

virt_wifi.c

virt_wifi: fix error on connect

2021-07-23 10:34:31 +02:00

wl3501_cs.c

wl3501_cs: Fix out-of-bounds warnings in wl3501_mgmt_join

2021-04-22 17:38:41 +03:00

wl3501.h

wl3501_cs: Fix out-of-bounds warnings in wl3501_mgmt_join

2021-04-22 17:38:41 +03:00