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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-23 16:13:06 +01:00
common	…
configs	ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in	2021-07-16 23:02:53 +02:00
crypto	…
include	mm: rename pud_page_vaddr to pud_pgtable and make it return pmd_t *	2021-07-08 11:48:22 -07:00
kernel	arm: convert to setup_initial_init_mm()	2021-07-08 11:48:21 -07:00
lib	…
mach-actions	…
mach-alpine	…
mach-artpec	…
mach-asm9260	…
mach-aspeed	…
mach-at91	…
mach-axxia	…
mach-bcm	…
mach-berlin	…
mach-clps711x	…
mach-cns3xxx	…
mach-davinci	arch: Kconfig: clean up obsolete use of HAVE_IDE	2021-07-30 08:19:09 -06:00
mach-digicolor	…
mach-dove	…
mach-ep93xx	…
mach-exynos	…
mach-footbridge	…
mach-gemini	…
mach-highbank	…
mach-hisi	…
mach-imx	Merge branch 'arm/fixes' into arm/soc	2021-07-09 10:46:02 -07:00
mach-integrator	…
mach-iop32x	…
mach-ixp4xx	ARM: SoC changes for 5.14	2021-07-10 09:22:44 -07:00
mach-keystone	…
mach-lpc18xx	…
mach-lpc32xx	…
mach-mediatek	…
mach-meson	…
mach-milbeaut	…
mach-mmp	…
mach-moxart	…
mach-mstar	…
mach-mv78xx0	…
mach-mvebu	…
mach-mxs	…
mach-nomadik	…
mach-npcm	…
mach-nspire	…
mach-omap1	Non-urgent fixes for omaps for v5.14 merge window	2021-06-23 18:45:23 -07:00
mach-omap2	Non-urgent fixes for omaps for v5.14 merge window	2021-06-23 18:45:23 -07:00
mach-orion5x	…
mach-oxnas	…
mach-pxa	…
mach-qcom	…
mach-rda	…
mach-realtek	…
mach-realview	…
mach-rockchip	…
mach-rpc	ARM: riscpc: Fix fall-through warning for Clang	2021-07-29 12:51:00 -05:00
mach-s3c	…
mach-s5pv210	…
mach-sa1100	…
mach-shmobile	…
mach-socfpga	…
mach-spear	…
mach-sti	…
mach-stm32	…
mach-sunxi	…
mach-tegra	…
mach-uniphier	…
mach-ux500	…
mach-versatile	…
mach-vexpress	…
mach-vt8500	…
mach-zynq	arm: zynq: don't disable CONFIG_ARM_GLOBAL_TIMER due to CONFIG_CPU_FREQ anymore	2021-06-16 17:33:04 +02:00
mm	arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM	2021-07-10 09:17:13 -07:00
net	bpf: Introduce BPF nospec instruction for mitigating Spectre v4	2021-07-29 00:20:56 +02:00
nwfpe	…
plat-omap	…
plat-orion	…
plat-pxa	…
plat-versatile	…
probes	ARM development updates for 5.14-rc1:	2021-07-06 11:52:58 -07:00
tools	ARM development updates for 5.14-rc1:	2021-07-06 11:52:58 -07:00
vdso	…
vfp	…
xen	ARM development updates for 5.14-rc1:	2021-07-06 11:52:58 -07:00
Kbuild	…
Kconfig	libata-5.14-2021-07-30	2021-07-30 10:56:47 -07:00
Kconfig-nommu	…
Kconfig.assembler	…
Kconfig.debug	ARM: SoC changes for 5.14	2021-07-10 09:22:44 -07:00
Makefile	…