David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -08:00
..
appldata	sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD	2018-10-26 16:26:32 -07:00
boot	s390: avoid vmlinux segments overlap	2018-10-26 10:19:40 +02:00
configs	s390: update defconfigs	2018-11-05 15:10:27 +01:00
crypto	crypto: drop mask=CRYPTO_ALG_ASYNC from 'cipher' tfm allocations	2018-11-20 14:26:55 +08:00
hypfs	s390/hypfs: do not use stack buffers for hardware data	2018-10-09 11:20:53 +02:00
include	s390/net: move pnet constants	2019-02-07 18:06:18 -08:00
kernel	s390/suspend: fix stack setup in swsusp_arch_suspend	2019-01-28 15:43:17 +01:00
kvm	s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity	2019-02-11 13:19:20 +01:00
lib	s390/kasan: avoid user access code instrumentation	2018-10-09 11:21:21 +02:00
mm	s390 updates for the 4.21 merge window	2019-01-02 18:37:01 -08:00
net	s390/net: convert pnetids to ascii	2019-02-21 10:34:37 -08:00
numa	s390 updates for 4.20-rc2	2018-11-09 06:30:44 -06:00
oprofile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
pci	Revert "s390/pci: remove bit_lock usage in interrupt handler"	2019-02-07 11:56:29 +01:00
purgatory	s390: clean up stacks setup	2018-09-20 13:20:29 +02:00
scripts	s390/build: add *.o.chkbss files to targets list	2018-07-02 12:32:23 +02:00
tools	kbuild: use assignment instead of define ... endef for filechk_* rules	2019-01-06 10:22:35 +09:00
Kbuild	s390/kexec_file: Add purgatory	2018-04-16 09:10:22 +02:00
Kconfig	Kconfig file consolidation for v4.21	2018-12-29 13:40:29 -08:00
Kconfig.debug	Kconfig: consolidate the "Kernel hacking" menu	2018-08-02 08:06:48 +09:00
Makefile	s390/kasan: increase instrumented stack size to 64k	2018-11-02 08:31:57 +01:00
defconfig	s390: update defconfigs	2018-11-05 15:10:27 +01:00