David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

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

2017-02-07 16:29:30 -05:00

..

alpha

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

arc

ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup

2017-02-07 10:02:01 -08:00

arm

ARM: orion: Register DSA switch as a MDIO device

2017-02-07 10:51:47 -05:00

arm64

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

2017-02-01 09:24:00 -08:00

avr32

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

blackfin

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2016-12-25 14:30:04 -08:00

c6x

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

cris

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

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

frv

frv: add missing atomic64 operations

2017-01-24 16:26:14 -08:00

h8300

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

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

hexagon

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

ia64

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

m32r

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

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

m68k

net: Remove usage of net_device last_rx member

2017-01-18 17:22:49 -05:00

metag

Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2016-12-25 14:05:56 -08:00

microblaze

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

mips

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2017-01-06 15:27:17 -08:00

mn10300

mn10300: fix build error of missing fpu_save()

2017-01-24 16:26:14 -08:00

nios2

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

openrisc

openrisc: Add _text symbol to fix ksym build error

2017-01-02 10:35:11 +09:00

parisc

parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header

2017-01-28 21:54:23 +01:00

powerpc

Merge tag 'powerpc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2017-02-03 11:10:06 -08:00

s390

s390/mm: Fix cmma unused transfer from pgste into pte

2017-01-24 16:03:42 +01:00

score

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

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

sh

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

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

sparc

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

2017-02-02 16:54:00 -05:00

tile

tile/ptrace: Preserve previous registers for short regset write

2017-01-06 15:14:08 -05:00

um

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

unicore32

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

x86

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

2017-02-06 14:16:23 -08:00

xtensa

Merge tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa

2017-02-02 12:39:10 -08:00

.gitignore

…

Kconfig

net:add one common config ARCH_WANT_RELAX_ORDER to support relax ordering

2017-01-18 16:33:00 -05:00