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
..
boot	parisc: Include compressed vmlinux file in vmlinuz boot kernel	2018-10-17 08:18:01 +02:00
configs	net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.	2017-09-04 13:25:20 +02:00
include	sock: Add SO_RCVTIMEO_NEW and SO_SNDTIMEO_NEW	2019-02-03 11:17:31 -08:00
kernel	parisc: Fix ptrace syscall number modification	2019-02-21 20:10:46 +01:00
lib	parisc: Fix and improve kernel stack unwinding	2018-08-13 09:54:17 +02:00
math-emu	signal/parisc: Use force_sig_fault where appropriate	2018-04-25 10:44:06 -05:00
mm	parisc: Remap hugepage-aligned pages in set_kernel_text_rw()	2019-01-05 00:39:30 +01:00
oprofile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
defpalo.conf
install.sh	parisc: make "make install" not depend on vmlinux	2013-11-07 22:28:06 +01: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	parisc: generate uapi header and system call table files	2018-12-10 08:26:04 +01:00
nm