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	ARM: 9049/1: locomo: make locomo bus's remove callback return void	2021-02-01 19:44:30 +00:00
configs	ARM: multi_v7_defconfig: Make NOP_USB_XCEIV driver built-in	2021-07-16 23:02:53 +02:00
crypto	crypto: arm - use a pattern rule for generating *.S files	2021-05-14 19:07:54 +08:00
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	ARM: at91: pm: Move prototypes to mutually included header	2021-03-26 18:20:49 +01:00
mach-axxia
mach-bcm	ARM: bcm: Select BRCMSTB_L2_IRQ for bcm2835	2021-01-25 21:59:06 +01:00
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	ARM: exynos: add missing of_node_put for loop iteration	2021-05-11 08:33:01 -04:00
mach-footbridge	ARM updates for 5.13-rc1:	2021-05-06 09:28:07 -07:00
mach-gemini
mach-highbank	arm: remove CONFIG_ARCH_HAS_HOLES_MEMORYMODEL	2020-12-15 12:13:42 -08:00
mach-hisi	ARM: hisi: use the correct HiSilicon copyright	2021-04-02 15:36:27 +08:00
mach-imx	Merge branch 'arm/fixes' into arm/soc	2021-07-09 10:46:02 -07:00
mach-integrator
mach-iop32x	ARM: iop32x: disable N2100 PCI parity reporting	2021-03-31 12:29:40 -05:00
mach-ixp4xx	ARM: SoC changes for 5.14	2021-07-10 09:22:44 -07:00
mach-keystone	ARM: keystone: fix integer overflow warning	2021-04-01 16:32:37 +02:00
mach-lpc18xx
mach-lpc32xx
mach-mediatek
mach-meson
mach-milbeaut
mach-mmp
mach-moxart
mach-mstar	ARM: mstar: Select MSTAR_MSC313_MPLL	2021-04-01 12:40:55 +02:00
mach-mv78xx0
mach-mvebu	of: net: pass the dst buffer to of_get_mac_address()	2021-04-13 14:35:02 -07:00
mach-mxs	ARM: mxs: Add serial number support for i.MX23, i.MX28 SoCs	2020-11-30 17:31:29 +08:00
mach-nomadik
mach-npcm	ARM: npcm: wpcm450: select interrupt controller driver	2021-05-18 15:27:27 +02:00
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	ARM: PXA: Fix cplds irqdesc allocation when using legacy mode	2021-05-10 14:12:25 +01:00
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	ARM: s3c: Remove unnecessary break in RX1950	2021-05-11 08:29:40 -04:00
mach-s5pv210	arm: remove CONFIG_ARCH_HAS_HOLES_MEMORYMODEL	2020-12-15 12:13:42 -08:00
mach-sa1100	ARM: 9049/1: locomo: make locomo bus's remove callback return void	2021-02-01 19:44:30 +00:00
mach-shmobile
mach-socfpga	ARM: socfpga: drop ARCH_SOCFPGA	2021-03-23 11:03:36 -05:00
mach-spear	ARM/spi: spear: Drop PL022 num_chipselect	2021-04-08 15:21:58 +01:00
mach-sti
mach-stm32	ARM: stm32: Add a new SoC - STM32H750	2021-04-01 09:54:45 +02:00
mach-sunxi	irqchip/sun6i-r: Use a stacked irqchip driver	2021-01-21 20:21:49 +00:00
mach-tegra	ARM: tegra: Don't enable unused PLLs on resume from suspend	2021-01-19 18:20:42 +01:00
mach-uniphier
mach-ux500	ARM: ux500: make ux500_cpu_die static	2021-04-01 22:30:49 +02:00
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	ARM: OMAP2+: Use DEFINE_SPINLOCK() for spinlock	2021-03-31 08:58:42 +03:00
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	ARM: 9051/1: vdso: remove unneded extra-y addition	2021-02-01 19:48:06 +00:00
vfp	ARM: 9044/1: vfp: use undef hook for VFP support detection	2020-12-21 11:19:19 +00:00
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	kbuild: require all architectures to have arch/$(SRCARCH)/Kbuild	2021-05-26 23:10:37 +09:00