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

Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

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

2017-04-21 20:23:53 -07:00

..

acpi

Merge branches 'acpi-bus', 'acpi-sleep' and 'acpi-processor'

2017-02-20 14:28:03 +01:00

asm-generic

vmlinux.lds: add missing VMLINUX_SYMBOL macros

2017-04-08 00:47:48 -07:00

clocksource

…

crypto

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

2017-04-18 09:03:50 -07:00

drm

drm/ttm, drm/vmwgfx: Relax permission checking when opening surfaces

2017-03-30 11:43:39 +02:00

dt-bindings

scripts/spelling.txt: add "overide" pattern and fix typo instances

2017-03-09 17:01:09 -08:00

keys

KEYS: Differentiate uses of rcu_dereference_key() and user_key_payload()

2017-03-02 10:09:00 +11:00

kvm

KVM: arm64: Ensure LRs are clear when they should be

2017-04-04 14:33:58 +02:00

linux

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

2017-04-21 20:23:53 -07:00

math-emu

…

media

media fixes for v4.11-rc2

2017-03-09 15:50:56 -08:00

memory

…

misc

…

net

NFC 4.12 pull request

2017-04-21 15:29:40 -04:00

pcmcia

…

ras

…

rdma

IB/core: Restore I/O MMU, s390 and powerpc support

2017-03-24 21:51:16 -04:00

rxrpc

…

scsi

scsi: mpt3sas: Avoid sleeping in interrupt context

2017-03-01 21:52:13 -05:00

soc

ARC updates for 4.11 rc1

2017-02-22 10:33:53 -08:00

sound

sched/headers: Prepare to remove spurious <linux/sched.h> inclusion dependencies

2017-03-02 08:42:41 +01:00

target

target: Fix ALUA transition state race between multiple initiators

2017-03-30 23:12:40 -07:00

trace

rxrpc: Trace client call connection

2017-04-06 11:10:41 +01:00

uapi

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

2017-04-21 20:23:53 -07:00

video

drm/exynos/decon5433: signal frame done interrupt at front porch

2017-03-21 13:17:22 +09:00

xen

Merge branch 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

2017-03-07 10:23:17 -08:00

Kbuild

…