David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
boot	Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm	2018-05-20 11:50:27 -07:00
common	Merge branches 'fixes', 'misc', 'sa1111' and 'sa1100-for-next' into for-next	2018-01-21 15:38:10 +00:00
configs	ARM: defconfig: Update Gemini defconfig	2018-04-26 16:55:43 +02:00
crypto	kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers	2018-04-07 19:04:02 +09:00
firmware	…
include	Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm	2018-05-20 11:50:27 -07:00
kernel	ARM: 8771/1: kprobes: Prohibit kprobes on do_undefinstr	2018-05-19 11:35:56 +01:00
kvm	arm/arm64: KVM: Add PSCI version selection API	2018-04-20 16:32:23 +01:00
lib	ARM: 8772/1: kprobes: Prohibit kprobes on get_user functions	2018-05-19 11:35:56 +01: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	ARM: at91: Kconfig: Update company to Microchip	2018-02-28 16:21:51 +01:00
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: board-dm646x-evm: set VPIF capture card name	2018-05-15 14:31:12 +05:30
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: Simplify code in coupled CPU idle hot path	2018-03-21 18:51:39 +01:00
mach-footbridge	…
mach-gemini	…
mach-highbank	…
mach-hisi	…
mach-imx	ARM: SoC platform updates for 4.17	2018-04-05 21:21:08 -07: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	ARM: keystone: fix platform_domain_notifier array overrun	2018-05-14 09:24:29 -07:00
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	mtd: nand: remove useless fields from pxa3xx NAND platform data	2018-03-02 21:51:41 +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-npcm	arm: npcm: enable L2 cache in NPCM7xx architecture	2018-04-10 16:40:03 +02:00
mach-nspire	ARM: nspire: Remove unneeded nspire_map_io()	2018-03-07 16:07:35 +01:00
mach-omap1	ARM: OMAP1: ams-delta: fix deferred_fiq handler	2018-05-03 10:06:41 -07:00
mach-omap2	ARM: OMAP2+: powerdomain: use raw_smp_processor_id() for trace	2018-05-01 07:49:31 -07: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.17	2018-04-05 21:21:08 -07:00
mach-qcom	…
mach-realview	…
mach-rockchip	ARM: rockchip: Set name of pmu regmap_config in smp code	2018-03-12 11:09:36 +01:00
mach-rpc	…
mach-s3c24xx	ARM: s3c24xx: jive: Fix some GPIO names	2018-04-26 16:55:03 +02:00
mach-s3c64xx	spi: spi-gpio: Rewrite to use GPIO descriptors	2018-02-14 16:02:41 +00:00
mach-s5pv210	ARM: S5PV210: Add SPDX license identifiers	2018-01-03 18:43:04 +01:00
mach-sa1100	ARM: sa1100/simpad: switch simpad CF to use gpiod APIs	2018-04-06 15:53:22 +01:00
mach-shmobile	ARM: shmobile: rcar-gen2: Add watchdog support	2018-03-13 20:54:16 +01:00
mach-socfpga	ARM: socfpga: PM: Drop useless check for PM_SUSPEND_STANDBY	2018-03-07 16:08:20 +01:00
mach-spear	…
mach-sti	…
mach-stm32	ARM: stm32: restore reboot capabilities	2018-03-05 09:11:58 +01:00
mach-sunxi	ARM: sunxi: mc-smp: Split out SoC-specific device node lookup sequence	2018-03-10 16:14:57 +08:00
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: Fix PMU IRQ regression	2018-03-07 16:42:38 +01: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	exec: pass stack rlimit into mm layout functions	2018-04-11 10:28:37 -07:00
net	bpf, arm32: save 4 bytes of unneeded stack space	2018-05-14 19:11:45 -07:00
nwfpe	…
oprofile	…
plat-iop	…
plat-omap	ARM: SoC platform updates for 4.17	2018-04-05 21:21:08 -07: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: 8770/1: kprobes: Prohibit probing on optimized_callback	2018-05-19 11:35:56 +01:00
tools	ARM: ep93xx: ts72xx: Add support for BK3 board - ts72xx derivative	2017-12-13 22:26:10 +01:00
vdso	…
vfp	ARM: fix kill( ,SIGFPE) breakage	2018-05-19 18:49:43 +01:00
xen	…
Kconfig	Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm	2018-04-09 09:19:30 -07: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: 8747/1: make CONFIG_DEBUG_WX depend on MMU	2018-03-24 14:27:48 +00:00
Makefile	arm: npcm: add basic support for Nuvoton BMCs	2018-03-06 17:54:23 +01:00