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	powerpc updates for 5.14	2021-07-02 12:54:34 -07:00
configs	TTY / Serial patches for 5.14-rc1	2021-07-05 14:08:24 -07:00
crypto	crypto: powepc/sha1 - remove unneeded semicolon	2021-03-07 15:13:14 +11:00
include	compat: make linux/compat.h available everywhere	2021-07-23 14:20:24 +01:00
kernel	powerpc fixes for 5.14 #2	2021-07-09 10:26:52 -07:00
kexec	powerpc updates for 5.14	2021-07-02 12:54:34 -07:00
kvm	KVM: PPC: Book3S HV Nested: Sanitise H_ENTER_NESTED TM state	2021-07-23 16:19:38 +10:00
lib	powerpc: Only build restart_table.c for 64s	2021-07-01 22:50:54 +10:00
math-emu	powerpc/64s: avoid reloading (H)SRR registers if they are still valid	2021-06-25 00:06:55 +10:00
mm	Revert "mm/pgtable: add stubs for {pmd/pub}_{set/clear}_huge"	2021-07-21 11:28:09 +01:00
net	bpf: Introduce BPF nospec instruction for mitigating Spectre v4	2021-07-29 00:20:56 +02:00
perf	powerpc updates for 5.14	2021-07-02 12:54:34 -07:00
platforms	powerpc/pasemi: Fix fall-through warning for Clang	2021-07-19 16:47:03 -05:00
purgatory	powerpc/kexec: Don't use .machine ppc64 in trampoline_64.S	2021-04-08 21:17:43 +10:00
sysdev	powerpc/xive: Fix error handling when allocating an IPI	2021-07-05 22:23:25 +10:00
tools	powerpc/tools: Remove 90 line limit in checkpatch script	2020-09-08 22:57:11 +10:00
xmon	powerpc updates for 5.14	2021-07-02 12:54:34 -07:00
Kbuild	powerpc/kexec: Move kexec files into a dedicated subdir.	2019-11-21 15:41:34 +11:00
Kconfig	arch: Kconfig: clean up obsolete use of HAVE_IDE	2021-07-30 08:19:09 -06:00
Kconfig.debug	powerpc: Make PPC_IRQ_SOFT_MASK_DEBUG depend on PPC64	2021-06-25 00:07:09 +10:00
Makefile	Kbuild updates for v5.14	2021-07-10 11:01:38 -07:00
Makefile.postlink	powerpc: unrel_branch_check.sh: use nm to find symbol value	2020-09-02 11:00:22 +10:00