David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

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

2016-07-06 10:35:22 -07:00

..

alpha

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

arc

ARC Fix for 4.7-rc6

2016-06-30 09:53:43 -07:00

arm

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

2016-07-06 10:35:22 -07:00

arm64

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

2016-06-30 05:03:36 -04:00

avr32

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

blackfin

printk/nmi: generic solution for safe printk in NMI

2016-05-20 17:58:30 -07:00

c6x

asm-generic patch for 4.7

2016-05-24 15:24:37 -07:00

cris

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

frv

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

h8300

Merge branch 'hash' of git://ftp.sciencehorizons.net/linux

2016-05-28 16:15:25 -07:00

hexagon

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

ia64

fix up initial thread stack pointer vs thread_info confusion

2016-06-24 17:07:33 -07:00

m32r

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2016-05-26 22:01:22 -07:00

m68k

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

metag

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

microblaze

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

mips

MIPS: Fix possible corruption of cache mode by mprotect.

2016-07-02 01:51:39 +02:00

mn10300

Merge branch 'akpm' (patches from Andrew)

2016-06-24 19:08:33 -07:00

nios2

nios2: get rid of superfluous __GFP_REPEAT

2016-06-24 17:23:52 -07:00

openrisc

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

parisc

parisc: get rid of superfluous __GFP_REPEAT

2016-06-24 17:23:52 -07:00

powerpc

powerpc fixes for 4.7 #5

2016-07-02 17:47:54 -07:00

s390

s390: fix test_fp_ctl inline assembly contraints

2016-06-28 09:24:28 +02:00

score

score: get rid of superfluous __GFP_REPEAT

2016-06-24 17:23:52 -07:00

sh

sh: get rid of superfluous __GFP_REPEAT

2016-06-24 17:23:52 -07:00

sparc

sparc: get rid of superfluous __GFP_REPEAT

2016-06-24 17:23:52 -07:00

tile

Merge branch 'akpm' (patches from Andrew)

2016-06-24 19:08:33 -07:00

um

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

unicore32

unicore32: get rid of superfluous __GFP_REPEAT

2016-06-24 17:23:52 -07:00

x86

KVM: nVMX: VMX instructions: fix segment checks when L1 is in long mode.

2016-06-27 15:30:44 +02:00

xtensa

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

.gitignore

…

Kconfig

Clarify naming of thread info/stack allocators

2016-06-24 15:09:37 -07:00