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
..
appldata	s390/appldata: use struct_size() helper	2020-06-29 16:32:34 +02:00
boot	s390/boot: fix use of expolines in the DMA code	2021-07-20 17:59:40 +02:00
configs	s390: update defconfigs	2021-07-20 17:59:40 +02:00
crypto	s390/archrandom: add parameter check for s390_arch_random_generate	2021-04-21 12:32:12 +02:00
hypfs	s390/hypfs: use register pair instead of register asm	2021-06-28 11:18:28 +02:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
kernel	s390 updates for 5.14-rc3	2021-07-21 13:51:26 -07:00
kvm	KVM: s390: restore old debugfs names	2021-07-27 16:59:00 -04:00
lib	s390/lib: use call_on_stack() macro	2021-07-08 22:12:18 +02:00
mm	s390/mm: use call_on_stack() macro	2021-07-08 22:12:18 +02:00
net	bpf: Introduce BPF nospec instruction for mitigating Spectre v4	2021-07-29 00:20:56 +02:00
pci	s390/pci: add zpci_set_irq()/zpci_clear_irq()	2021-06-28 11:18:28 +02:00
purgatory	s390: disable SSP when needed	2021-06-07 17:07:00 +02:00
tools	KVM: s390: gen_facilities: allow facilities 165, 193, 194 and 196	2021-06-23 09:35:03 +02:00
Kbuild	s390/numa: move code to arch/s390/kernel	2020-08-11 18:16:55 +02:00
Kconfig	s390/vdso: add minimal compat vdso	2021-07-08 15:37:28 +02:00
Kconfig.debug	s390/cio: add CRW inject functionality	2021-03-22 11:36:04 +01:00
Makefile	Kbuild updates for v5.14	2021-07-10 11:01:38 -07:00