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
Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-02-20 14:37:08 -08:00
perf build: Add special fixdep cleaning rule
2017-02-17 16:04:38 -03:00
tools: hv: Add clean up function for Ubuntu config
2017-03-06 17:10:40 -08:00
bpf: fix comment typo
2017-04-09 18:26:08 -07:00
kvm /kvm_stat
tools/leds: Add led_hw_brightness_mon program
2017-02-14 22:20:23 +01:00
scripts/spelling.txt: add "overide" pattern and fix typo instances
2017-03-09 17:01:09 -08:00
tools/lib/bpf: expose bpf_program__set_type()
2017-04-01 12:45:57 -07:00
tools: bpf_jit_disasm: Add option to dump JIT image to a file.
2017-04-13 13:04:03 -04:00
objtool: Fix another GCC jump table detection issue
2017-03-07 08:42:55 +01:00
perf/urgent annotate fix for s390:
2017-04-11 21:41:39 +02:00
cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores
2017-04-13 14:51:10 +02:00
tools: Suppress request for warning options not existent in clang
2017-02-14 10:34:35 -03:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-04-15 21:16:30 -04:00
thermal /tmon
tools/vm: add missing Makefile rules
2017-02-22 16:41:26 -08:00
6b6cbc1471