David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
actions	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
amlogic	soc: amlogic: fix compile failure with MESON_SECURE_PM_DOMAINS & !MESON_SM	2020-02-29 08:53:43 -08:00
aspeed	soc: aspeed: Fix snoop_file_poll()'s return type	2019-12-05 10:10:08 -08:00
atmel	drivers: soc: atmel: move sam9x60 under its own config flag	2019-12-10 00:44:53 +01:00
bcm	soc: bcm: brcmstb: biuctrl: Update programming for 7211	2020-01-05 13:44:04 -08:00
dove	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
fsl	soc: fsl: dpio: properly compute the consumer index	2020-05-07 17:35:24 -07:00
gemini	soc: Add SoC driver for Gemini	2018-01-04 17:01:53 +01:00
imx	soc: imx8: select SOC_BUS	2020-04-17 17:20:44 +02:00
ixp4xx	soc: ixp4xx: Protect IXP4xx SoC drivers by ARCH_IXP4XX || COMPILE_TEST	2019-08-29 17:34:38 +02:00
kendryte	riscv: Add Kendryte K210 SoC support	2020-04-03 10:49:52 -07:00
lantiq	soc: lantiq: convert to devm_platform_ioremap_resource	2020-01-10 11:44:52 -08:00
mediatek	soc: mediatek: cmdq: return send msg error code	2020-05-16 19:55:50 +02:00
qcom	soc: qcom: Fix QCOM_APR dependencies	2020-03-16 15:07:19 -07:00
renesas	ARM: driver updates	2020-04-03 15:05:35 -07:00
rockchip	ARM: SoC-related driver updates	2019-07-19 17:13:56 -07:00
samsung	soc: samsung: chipid: Fix return value on non-Exynos platforms	2020-03-25 14:27:27 +01:00
sifive	riscv: move sifive_l2_cache.h to include/soc	2020-01-12 10:12:44 -08:00
sunxi	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
tegra	soc/tegra: Changes for v5.7-rc1	2020-03-25 20:56:55 +01:00
ti	soc: ti: pm33xx: Add base cpuidle support	2020-02-27 09:27:28 -08:00
ux500	ARM: ux500: add missing of_node_put()	2019-07-23 09:49:32 +02:00
versatile	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
xilinx	drivers: soc: xilinx: fix firmware driver Kconfig dependency	2020-04-15 08:15:55 +02:00
zte	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 194	2019-05-30 11:29:22 -07:00
Kconfig	riscv: Add Kendryte K210 SoC support	2020-04-03 10:49:52 -07:00
Makefile	RISC-V Patches for the 5.7 Merge Window, Part 1	2020-04-09 10:51:30 -07:00