David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-06-15 11:59:32 -04:00

..

boot

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

2017-05-22 23:32:48 -04:00

configs

Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2017-05-05 11:36:44 -07:00

crypto

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2017-05-02 15:53:46 -07:00

include

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

2017-06-15 11:59:32 -04:00

kernel

powerpc/mm/4k: Limit 4k page size config to 64TB virtual address space

2017-06-08 20:42:56 +10:00

kvm

KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms

2017-05-12 15:32:30 +10:00

lib

Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2017-05-05 11:36:44 -07:00

math-emu

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

mm

powerpc/mm/4k: Limit 4k page size config to 64TB virtual address space

2017-06-08 20:42:56 +10:00

net

bpf: Add jited_len to struct bpf_prog

2017-06-06 15:41:24 -04:00

oprofile

ktime: Cleanup ktime_set() usage

2016-12-25 17:21:22 +01:00

perf

powerpc/perf: Fix Power9 test_adder fields

2017-06-06 21:21:19 +10:00

platforms

powerpc/book3s64: Move PPC_DT_CPU_FTRs and enable it by default

2017-06-08 20:42:57 +10:00

purgatory

kexec, x86/purgatory: Unbreak it and clean it up

2017-03-10 20:55:09 +01:00

sysdev

powerpc/sysdev/simple_gpio: Fix oops in gpio save_regs function

2017-06-01 19:54:41 +10:00

tools

powerpc: Add arch/powerpc/tools directory

2017-04-28 21:26:53 +10:00

xmon

powerpc/xmon: Teach xmon oops about radix vectors

2017-05-01 18:52:58 +10:00

Kconfig

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2017-06-11 16:17:29 -07:00

Kconfig.debug

powerpc/xmon: Enable disassembly files (compilation changes)

2017-02-15 20:02:42 +11:00

Makefile

powerpc: Add arch/powerpc/tools directory

2017-04-28 21:26:53 +10:00

Makefile.postlink

powerpc: Fix distclean with Makefile.postlink

2017-05-09 19:24:23 +10:00