David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
boot	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-24 19:21:58 -07:00
common	ARM: Always build secure_cntvoff.S on ARM V7 to fix shmobile !SMP build	2018-06-23 18:26:48 -07:00
configs	i.MX fixes for 4.18, round 2:	2018-07-03 09:47:36 -07:00
crypto	crypto: arm/speck - fix building in Thumb2 mode	2018-07-01 23:31:46 +08:00
firmware	ARM: disable KCOV for trusted foundations code	2018-07-03 17:32:19 -07:00
include	docs: Fix some broken references	2018-06-15 18:10:01 -03:00
kernel	Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm	2018-08-01 15:01:26 -07:00
kvm	arm: port KCOV to arm	2018-06-15 07:55:24 +09:00
lib	ARM: 8772/1: kprobes: Prohibit kprobes on get_user functions	2018-05-19 11:35:56 +01:00
mach-actions	…
mach-alpine	…
mach-artpec	…
mach-asm9260	…
mach-aspeed	…
mach-at91	…
mach-axxia	…
mach-bcm	PCI: controller: Move PCI_DOMAINS selection to arch Kconfig	2018-06-26 15:37:37 -05:00
mach-berlin	ARM: berlin: switch to SPDX license identifier	2018-05-24 14:49:09 +08:00
mach-clps711x	…
mach-cns3xxx	…
mach-davinci	ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD	2018-06-26 20:01:29 +05:30
mach-digicolor	…
mach-dove	…
mach-ebsa110	…
mach-efm32	…
mach-ep93xx	sound updates for 4.18	2018-06-06 09:08:38 -07:00
mach-exynos	…
mach-footbridge	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
mach-gemini	…
mach-highbank	…
mach-hisi	…
mach-imx	regulator: gpio: Revert	2018-06-07 14:23:08 +01:00
mach-integrator	…
mach-iop13xx	…
mach-iop32x	…
mach-iop33x	…
mach-ixp4xx	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
mach-keystone	ARM: keystone: fix platform_domain_notifier array overrun	2018-05-14 09:24:29 -07:00
mach-ks8695	i2c: gpio: move header to platform_data	2018-05-17 16:27:09 +02:00
mach-lpc18xx	…
mach-lpc32xx	…
mach-mediatek	…
mach-meson	ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8	2018-05-23 10:08:13 -07:00
mach-mmp	regulator: gpio: Revert	2018-06-07 14:23:08 +01:00
mach-moxart	…
mach-mv78xx0	…
mach-mvebu	…
mach-mxs	…
mach-netx	…
mach-nomadik	…
mach-npcm	…
mach-nspire	…
mach-omap1	Merge branch 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2018-06-14 16:21:46 +09:00
mach-omap2	ARM: DRA7/OMAP5: Enable ACTLR[0] (Enable invalidates of BTB) for secondary cores	2018-07-12 03:56:32 -07:00
mach-orion5x	…
mach-oxnas	…
mach-picoxcell	…
mach-prima2	…
mach-pxa	ARM: pxa: irq: fix handling of ICMR registers in suspend/resume	2018-07-07 13:25:15 +02:00
mach-qcom	…
mach-realview	…
mach-rockchip	…
mach-rpc	mm: do not initialize TLB stack vma's with vma_init()	2018-08-01 13:43:38 -07:00
mach-s3c24xx	Samsung mach/soc changes for v4.18	2018-05-14 13:52:23 -07:00
mach-s3c64xx	regulator: gpio: Revert	2018-06-07 14:23:08 +01:00
mach-s5pv210	…
mach-sa1100	Merge branch 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2018-06-14 16:21:46 +09:00
mach-shmobile	ARM: SoC platform updates	2018-06-11 17:49:09 -07:00
mach-socfpga	PCI: controller: Move PCI_DOMAINS selection to arch Kconfig	2018-06-26 15:37:37 -05:00
mach-spear	…
mach-sti	…
mach-stm32	ARM: stm32: Don't select DMA unconditionally on STM32MP157C	2018-05-25 15:26:38 -07:00
mach-sunxi	…
mach-tango	…
mach-tegra	ARM: SoC platform updates	2018-06-11 17:49:09 -07:00
mach-u300	…
mach-uniphier	…
mach-ux500	…
mach-versatile	…
mach-vexpress	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
mach-vt8500	…
mach-w90x900	…
mach-zx	…
mach-zynq	…
mm	ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot	2018-07-11 22:57:57 +01:00
net	ARM: net: bpf: improve 64-bit ALU implementation	2018-07-13 15:26:42 +02:00
nwfpe	…
oprofile	…
plat-iop	…
plat-omap	…
plat-orion	…
plat-pxa	…
plat-samsung	…
plat-versatile	…
probes	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
tools	arm: Wire up restartable sequences system call	2018-06-06 11:58:31 +02:00
vdso	arm: port KCOV to arm	2018-06-15 07:55:24 +09:00
vfp	Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2018-06-04 15:23:48 -07:00
xen	xen: share start flags between PV and PVH	2018-06-19 13:51:00 +02:00
Kconfig	PCI: controller: Move PCI_DOMAINS selection to arch Kconfig	2018-06-26 15:37:37 -05:00
Kconfig-nommu	…
Kconfig.debug	…
Makefile	ARM: SoC platform updates	2018-06-11 17:49:09 -07:00