David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

All three conflicts were cases of simple overlapping
changes.

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

2016-08-30 00:54:02 -04:00

..

alpha

RTC for 4.8

2016-08-05 09:48:22 -04:00

arc

ARC: export __udivdi3 for modules

2016-08-19 14:09:33 -07:00

arm

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

2016-08-29 12:29:13 -07:00

arm64

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

2016-08-30 00:54:02 -04:00

avr32

dma-mapping: use unsigned long for dma_attrs

2016-08-04 08:50:07 -04:00

blackfin

net: smc91x: fix SMC accesses

2016-08-28 23:44:55 -04:00

c6x

dma-mapping: use unsigned long for dma_attrs

2016-08-04 08:50:07 -04:00

cris

dma-mapping: use unsigned long for dma_attrs

2016-08-04 08:50:07 -04:00

frv

RTC for 4.8

2016-08-05 09:48:22 -04:00

h8300

h8300: Add missing include file to asm/io.h

2016-08-13 08:53:56 -07:00

hexagon

dma-mapping: use unsigned long for dma_attrs

2016-08-04 08:50:07 -04:00

ia64

Implements HARDENED_USERCOPY verification of copy_to_user/copy_from_user

2016-08-08 14:48:14 -07:00

m32r

mm: do not pass mm_struct into handle_mm_fault

2016-07-26 16:19:19 -07:00

m68k

m68knommu: fix user a5 register being overwritten

2016-08-08 12:38:47 +10:00

metag

metag: Drop show_mem() from mem_init()

2016-08-09 13:41:30 +01:00

microblaze

dma-mapping: use unsigned long for dma_attrs

2016-08-04 08:50:07 -04:00

mips

* ARM fixes:

2016-08-27 15:51:50 -07:00

mn10300

RTC for 4.8

2016-08-05 09:48:22 -04:00

nios2

dma-mapping: use unsigned long for dma_attrs

2016-08-04 08:50:07 -04:00

openrisc

dma-mapping: use unsigned long for dma_attrs

2016-08-04 08:50:07 -04:00

parisc

parisc: Fix order of EREFUSED define in errno.h

2016-08-20 13:33:53 +02:00

powerpc

powerpc: signals: Discard transaction state from signal frames

2016-08-29 12:48:40 +10:00

s390

treewide: replace config_enabled() with IS_ENABLED() (2nd round)

2016-08-26 17:39:35 -07:00

score

treewide: replace obsolete _refok by __ref

2016-08-02 17:31:41 -04:00

sh

These changes improve device tree support (including builtin DTB), add

2016-08-06 09:00:05 -04:00

sparc

Implements HARDENED_USERCOPY verification of copy_to_user/copy_from_user

2016-08-08 14:48:14 -07:00

tile

tile: support static_key usage in non-module __exit sections

2016-08-04 08:50:07 -04:00

um

um: Don't discard .text.exit section

2016-08-23 23:16:16 +02:00

unicore32

unicore32: mm: Add missing parameter to arch_vma_access_permitted

2016-08-13 08:53:18 -07:00

x86

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

2016-08-28 10:00:21 -07:00

xtensa

dma-mapping: use unsigned long for dma_attrs

2016-08-04 08:50:07 -04:00

.gitignore

…

Kconfig

Implements HARDENED_USERCOPY verification of copy_to_user/copy_from_user

2016-08-08 14:48:14 -07:00