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

The bpf syscall and selftests conflicts were trivial
overlapping changes.

The r8169 change involved moving the added mdelay from 'net' into a
different function.

A TLS close bug fix overlapped with the splitting of the TLS state
into separate TX and RX parts.  I just expanded the tests in the bug
fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf
== X".

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

2018-05-11 20:53:22 -04:00

..

acpi

xen: fixes for 4.17-rc1

2018-04-12 11:04:35 -07:00

asm-generic

earlycon: Use a pointer table to fix __earlycon_table stride

2018-04-23 10:06:59 +02:00

clocksource

ARM: SoC platform updates for 4.17

2018-04-05 21:21:08 -07:00

crypto

crypto: api - Remove unused crypto_type lookup function

2018-03-31 01:32:57 +08:00

drm

drm: Fix HDCP downstream dev count read

2018-04-16 12:10:48 -04:00

dt-bindings

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

2018-05-11 20:53:22 -04:00

keys

…

kvm

KVM: arm/arm64: vgic: Fix source vcpu issues for GICv2 SGI

2018-04-27 12:39:09 +01:00

linux

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

2018-05-11 20:53:22 -04:00

math-emu

…

media

MAINTAINERS & files: Canonize the e-mails I use at files

2018-05-04 06:21:06 -04:00

memory

…

misc

…

net

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

2018-05-11 20:53:22 -04:00

pcmcia

…

ras

…

rdma

Merge candidates for 4.17 merge window

2018-04-06 17:35:43 -07:00

scsi

scsi: core: remove reference to scsi_show_extd_sense()

2018-04-18 23:37:39 -04:00

soc

soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure

2018-04-16 15:15:23 -07:00

sound

ALSA: control: Hardening for potential Spectre v1

2018-04-25 10:37:46 +02:00

target

…

trace

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

2018-05-11 20:53:22 -04:00

uapi

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

2018-05-11 20:53:22 -04:00

video

…

xen

xen/sndif: Sync up with the canonical definition in Xen

2018-04-17 08:26:33 -04:00