David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05:00
common	Merge branches 'fixes', 'misc', 'sa1111' and 'sa1100-for-next' into for-next	2018-01-21 15:38:10 +00:00
configs	ARM: omap2: set CONFIG_LIRC=y in defconfig	2018-02-26 21:38:58 +01:00
crypto	crypto: hash - annotate algorithms taking optional key	2018-01-12 23:03:35 +11:00
firmware	…
include	KVM changes for 4.16	2018-02-10 13:16:35 -08:00
kernel	treewide/trivial: Remove ';;$' typo noise	2018-02-22 10:59:33 +01:00
kvm	ARM: kvm: fix building with gcc-8	2018-02-15 20:58:36 +01:00
lib	Merge branches 'fixes', 'misc', 'sa1111' and 'sa1100-for-next' into for-next	2018-01-21 15:38:10 +00:00
mach-actions	ARM: SoC platform updates for 4.15	2017-11-16 14:05:12 -08:00
mach-alpine	…
mach-artpec	…
mach-asm9260	…
mach-aspeed	…
mach-at91	…
mach-axxia	…
mach-bcm	soc: brcmstb: biuctrl: Move to early_initcall	2017-12-20 17:37:44 -08:00
mach-berlin	…
mach-clps711x	ARM: clps711x: mark clps711x_compat as const	2018-02-22 17:42:42 +01:00
mach-cns3xxx	…
mach-davinci	ARM: davinci: mark spi_board_info arrays as const	2018-02-22 17:43:16 +01:00
mach-digicolor	…
mach-dove	…
mach-ebsa110	…
mach-efm32	…
mach-ep93xx	ARM: ep93xx: ts72xx: Add support for BK3 board - ts72xx derivative	2017-12-13 22:26:10 +01:00
mach-exynos	ARM: EXYNOS: Add SPDX license identifiers	2018-01-03 18:36:22 +01:00
mach-footbridge	…
mach-gemini	…
mach-highbank	…
mach-hisi	…
mach-imx	ARM: imx: remove unused imx3 pm definitions	2017-12-26 16:30:20 +08:00
mach-integrator	ARM: SoC platform updates for 4.15	2017-11-16 14:05:12 -08:00
mach-iop13xx	…
mach-iop32x	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
mach-iop33x	…
mach-ixp4xx	w1: w1-gpio: Convert to use GPIO descriptors	2017-12-08 15:32:53 +01:00
mach-keystone	…
mach-ks8695	…
mach-lpc18xx	…
mach-lpc32xx	…
mach-mediatek	ARM: mediatek: use more generic prompts for SoCs with ARMv7	2017-12-20 15:48:18 +01:00
mach-meson	Amlogic 32-bit DT changes for v4.16	2017-12-21 16:37:34 +01:00
mach-mmp	ARM: pxa: move header file out of I2C realm	2017-11-28 22:49:30 +01:00
mach-moxart	…
mach-mv78xx0	…
mach-mvebu	ARM: mvebu: Fix broken PL310_ERRATA_753970 selects	2018-02-13 16:39:51 +01:00
mach-mxs	…
mach-netx	…
mach-nomadik	…
mach-nspire	…
mach-omap1	ARM: OMAP1: clock: Fix debugfs_create_*() usage	2018-02-14 08:35:14 -08:00
mach-omap2	ARM: OMAP2+: Fix sar_base inititalization for HS omaps	2018-02-14 08:35:14 -08:00
mach-orion5x	ARM: orion5x: Revert commit 4904dbda41.	2018-02-26 13:41:47 -05:00
mach-oxnas	…
mach-picoxcell	…
mach-prima2	…
mach-pxa	ARM: SoC platform updates for 4.16	2018-02-01 16:17:40 -08:00
mach-qcom	…
mach-realview	…
mach-rockchip	…
mach-rpc	…
mach-s3c24xx	ARM: S3C24XX: Add SPDX license identifiers	2018-01-03 18:36:43 +01:00
mach-s3c64xx	ARM: S3C64XX: Add SPDX license identifiers	2018-01-03 18:42:53 +01:00
mach-s5pv210	ARM: S5PV210: Add SPDX license identifiers	2018-01-03 18:43:04 +01:00
mach-sa1100	ARM: sa1100/neponset: add GPIO drivers for control and modem registers	2018-01-01 00:50:05 +00:00
mach-shmobile	ARM: SoC platform updates for 4.15	2017-11-16 14:05:12 -08:00
mach-socfpga	…
mach-spear	…
mach-sti	…
mach-stm32	…
mach-sunxi	…
mach-tango	…
mach-tegra	…
mach-u300	…
mach-uniphier	kbuild: remove all dummy assignments to obj-	2017-11-18 11:46:06 +09:00
mach-ux500	ARM: ux500: remove PMU IRQ bouncer	2018-02-20 11:34:53 +00:00
mach-versatile	…
mach-vexpress	ARM: SoC platform updates for 4.15	2017-11-16 14:05:12 -08:00
mach-vt8500	arm: vt8500: kconfig: Remove blank help text	2018-02-02 23:53:10 +09:00
mach-w90x900	…
mach-zx	…
mach-zynq	…
mm	Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm	2018-02-02 09:50:51 -08:00
net	bpf, arm: remove obsolete exception handling from div/mod	2018-01-26 16:42:07 -08:00
nwfpe	…
oprofile	…
plat-iop	…
plat-omap	ARM: SoC platform updates for 4.15	2017-11-16 14:05:12 -08:00
plat-orion	ARM: orion: fix orion_ge00_switch_board_info initialization	2018-02-22 17:48:39 +01:00
plat-pxa	…
plat-samsung	ARM: SAMSUNG: Add SPDX license identifiers	2018-01-03 18:43:13 +01:00
plat-versatile	…
probes	ARM: probes: avoid adding kprobes to sensitive kernel-entry/exit code	2017-12-17 22:14:21 +00:00
tools	ARM: ep93xx: ts72xx: Add support for BK3 board - ts72xx derivative	2017-12-13 22:26:10 +01:00
vdso	…
vfp	signal/arm: Document conflicts with SI_USER and SIGFPE	2018-01-12 14:21:05 -06:00
xen	…
Kconfig	Currently, hardened usercopy performs dynamic bounds checking on slab	2018-02-03 16:25:42 -08:00
Kconfig-nommu	Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm	2017-11-16 12:50:35 -08:00
Kconfig.debug	ARM: 8737/1: mm: dump: add checking for writable and executable	2018-01-21 15:32:20 +00:00
Makefile	ARM: 8723/2: always assume the "unified" syntax for assembly code	2017-12-17 22:14:21 +00:00