David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
block	s390/dasd: fix IO error for newly defined devices	2018-04-23 07:57:16 +02:00
char	s390/sclp: avoid potential usage of uninitialized value	2018-04-16 09:10:17 +02:00
cio	s390/qdio: don't release memory in qdio_setup_irq()	2018-05-15 07:40:38 +02:00
crypto	s390/zcrypt: Support up to 256 crypto adapters.	2018-04-11 10:36:27 +02:00
net	s390/qeth: improve fallback to random MAC address	2018-04-27 13:38:49 -04:00
scsi	bsg-lib: introduce a timeout field in struct bsg_job	2018-03-13 11:40:21 -06:00
virtio	virtio/s390: implement PM operations for virtio_ccw	2018-02-14 14:34:09 +02:00
Makefile	kbuild: rename built-in.o to built-in.a	2018-03-26 02:01:19 +09:00