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

..

configs

[IA64] refresh arch/ia64/configs/* using "make savedefconfig"

2014-09-23 11:09:29 -07:00

dig

Disintegrate asm/system.h for IA64

2012-03-28 18:30:02 +01:00

hp

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/debug.h>

2017-03-02 08:42:34 +01:00

include

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-04-15 21:16:30 -04:00

kernel

sched/core: Remove unused prefetch_stack()

2017-03-03 01:45:38 +01:00

lib

ia64: restore symbol versions for symbols defined in assembly

2017-04-13 18:19:49 -07: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

Disintegrate asm/system.h for IA64

2012-03-28 18:30:02 +01:00

pci

PCI: Set ROM shadow location in arch code, not in PCI core

2016-03-08 12:14:31 -06:00

scripts

ia64: remove paravirt code

2015-06-10 14:26:32 -07:00

sn

sched/headers: Prepare to remove the <linux/mm_types.h> dependency from <linux/sched.h>

2017-03-02 08:42:37 +01:00

uv

ia64: change to new flag variables

2011-03-17 14:02:56 +01:00

install.sh

…

Kconfig

Implements HARDENED_USERCOPY verification of copy_to_user/copy_from_user

2016-08-08 14:48:14 -07:00

Kconfig.debug

…

Makefile

kbuild: drop redundant "PHONY += FORCE"

2016-04-20 10:38:40 +02:00

module.lds

…