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

en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.

The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.

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

2018-01-23 13:51:56 -05:00

..

acpi

Merge branch 'acpi-ec' into acpi

2017-11-30 13:37:29 +01:00

asm-generic

error-injection: Add injectable error types

2018-01-12 17:33:38 -08:00

clocksource

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-11-15 10:56:56 -08:00

crypto

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

2018-01-05 12:10:06 -08:00

drm

drm: rework delayed connector cleanup in connector_iter

2017-12-13 22:59:00 +01:00

dt-bindings

Merge tag 'drm-for-v4.15-part2' of git://people.freedesktop.org/~airlied/linux

2017-11-23 21:04:56 -10:00

keys

…

kvm

KVM: arm/arm64: timer: Don't set irq as forwarded if no usable GIC

2017-12-18 10:53:23 +01:00

linux

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

2018-01-23 13:51:56 -05:00

math-emu

…

media

Merge tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2017-11-15 20:30:12 -08:00

memory

…

misc

…

net

net: sched: create tc_can_offload_extack() wrapper

2018-01-22 16:28:32 -05:00

pcmcia

…

ras

…

rdma

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

2017-11-15 14:54:53 -08:00

scsi

scsi: libsas: align sata_device's rps_resp on a cacheline

2017-11-21 23:06:32 -05:00

soc

Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2017-11-17 20:04:24 -08:00

sound

ALSA: hda - Fix yet remaining issue with vmaster 0dB initialization

2017-11-22 12:34:56 +01:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2017-11-24 19:19:20 -10:00

trace

net: tracepoint: exposing sk_faimily in tracepoint inet_sock_set_state

2018-01-08 14:32:45 -05:00

uapi

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

2018-01-23 13:51:56 -05:00

video

Merge tag 'fbdev-v4.15' of git://github.com/bzolnier/linux

2017-11-20 21:50:24 -10:00

xen

Merge tag 'for-linus-4.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2017-12-22 12:30:10 -08:00