David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-15 21:16:30 -04:00
..
boot	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
include	New getsockopt option to get socket cookie	2017-04-08 08:07:01 -07:00
kernel	alpha: fix stack smashing in old_adjtimex(2)	2017-04-03 01:06:53 -04:00
lib	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
math-emu	sched/headers: Prepare for the removal of <asm/ptrace.h> from <linux/sched.h>	2017-03-02 08:42:31 +01:00
mm	sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>	2017-03-02 08:42:29 +01:00
oprofile	alpha: delete non-required instances of <linux/init.h>	2015-05-26 10:01:48 -07:00
Kconfig	atomic64: no need for CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE	2016-10-07 18:46:30 -07:00
Kconfig.debug	alpha/parisc: remove config variable DEBUG_RWLOCK	2008-02-06 10:41:03 -08:00
Makefile	alpha: makefile: don't enforce small data model for kernel builds	2013-04-07 12:59:30 -07:00
defconfig	defconfig reduction	2010-08-14 22:26:53 +02:00