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

..

boot

sparc: piggyback: handle invalid image

2020-06-22 15:44:44 -07:00

configs

drivers/char: remove /dev/kmem for good

2021-05-07 00:26:34 -07:00

crypto

crypto: sparc - Fix sparse endianness warnings

2020-11-27 17:13:42 +11:00

include

compat: make linux/compat.h available everywhere

2021-07-23 14:20:24 +01:00

kernel

Merge tag 'kbuild-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2021-07-10 11:01:38 -07:00

lib

locking/atomic: sparc: move to ARCH_ATOMIC

2021-05-26 13:20:52 +02:00

math-emu

treewide: Use fallthrough pseudo-keyword

2020-08-23 17:36:59 -05:00

mm

mm/hugetlb: change parameters of arch_make_huge_pte()

2021-06-30 20:47:26 -07:00

net

bpf: Introduce BPF nospec instruction for mitigating Spectre v4

2021-07-29 00:20:56 +02:00

power

treewide: Add SPDX license identifier - Makefile/Kconfig

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

prom

…

vdso

treewide: remove DISABLE_LTO

2020-10-21 00:28:53 +09:00

Kbuild

treewide: Add SPDX license identifier - Kbuild

2019-05-30 11:32:33 -07:00

Kconfig

arch: Kconfig: clean up obsolete use of HAVE_IDE

2021-07-30 08:19:09 -06:00

Kconfig.debug

Kconfig: consolidate the "Kernel hacking" menu

2018-08-02 08:06:48 +09:00

Makefile

kbuild: require all architectures to have arch/$(SRCARCH)/Kbuild

2021-05-26 23:10:37 +09:00