David S. Miller 16ae1f2236 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmmii.c
	drivers/net/hyperv/netvsc.c
	kernel/bpf/hashtab.c

Almost entirely overlapping changes.

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

2017-03-23 16:41:27 -07:00

..

auxvec.h

powerpc: Add new cache geometry aux vectors

2017-02-06 19:46:04 +11:00

bitsperlong.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

bootx.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

byteorder.h

powerpc: Include the appropriate endianness header

2013-10-11 16:48:33 +11:00

cputable.h

powerpc: scan_features() updates incorrect bits for REAL_LE

2016-04-18 20:08:38 +10:00

eeh.h

powerpc/eeh: Introduce eeh_pe_inject_err()

2015-05-12 20:33:35 +10:00

elf.h

powerpc: Move ARCH_DLINFO out of uapi

2017-02-06 19:46:04 +11:00

epapr_hcalls.h

powerpc: Fix misspellings in comments.

2016-03-01 19:27:20 +11:00

errno.h

powerpc/kernel: Switch to using MAX_ERRNO

2015-07-29 11:56:11 +10:00

fcntl.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

ioctl.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

ioctls.h

tty, ioctls -- Add new ioctl definitions for tty flags fetching

2012-10-25 12:07:18 -07:00

ipcbuf.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

Kbuild

powerpc: Export include/uapi/asm/eeh.h

2015-08-18 19:34:41 +10:00

kvm_para.h

KVM: PPC: Disable NX for old magic page using guests

2014-05-30 14:26:24 +02:00

kvm.h

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

2017-01-31 19:21:26 +11:00

mman.h

mm: mlock: add mlock flags to enable VM_LOCKONFAULT usage

2015-11-05 19:34:48 -08:00

msgbuf.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

nvram.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

opal-prd.h

powerpc/powernv: Add opal-prd channel

2015-06-05 08:32:21 +10:00

param.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

perf_event.h

powerpc/perf: Export PERF_EVENT_CONFIG_EBB_SHIFT to userspace

2013-08-01 13:11:46 +10:00

perf_regs.h

powerpc/perf: Assign an id to each powerpc register

2016-04-21 23:32:59 +10:00

poll.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

posix_types.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

ps3fb.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

ptrace.h

powerpc: Change vrX register defines to vX to match gcc and glibc

2015-03-16 18:32:11 +11:00

resource.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

sembuf.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

setup.h

powerpc: Bump COMMAND_LINE_SIZE to 2048

2014-04-28 16:31:58 +10:00

shmbuf.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

sigcontext.h

powerpc/signal: Fix confusing header documentation in sigcontext.h

2015-07-16 16:14:40 +10:00

siginfo.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

signal.h

powerpc: switch to generic old sigaction()

2013-02-03 18:16:10 -05:00

socket.h

sock: introduce SO_MEMINFO getsockopt

2017-03-22 11:18:58 -07:00

sockios.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

spu_info.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

stat.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

statfs.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

swab.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

termbits.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

termios.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

tm.h

powerpc/tm: Abort syscalls in active transactions

2015-06-19 17:10:28 +10:00

types.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

ucontext.h

UAPI: (Scripted) Disintegrate arch/powerpc/include/asm

2012-10-09 09:47:26 +01:00

unistd.h

powerpc: Wire up statx() syscall

2017-03-16 20:45:53 +11:00