linux/drivers/s390
David S. Miller 3313da8188 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The netfilter conflicts were rather simple overlapping
changes.

However, the cls_tcindex.c stuff was a bit more complex.

On the 'net' side, Cong is fixing several races and memory
leaks.  Whilst on the 'net-next' side we have Vlad adding
the rtnl-ness support.

What I've decided to do, in order to resolve this, is revert the
conversion over to using a workqueue that Cong did, bringing us back
to pure RCU.  I did it this way because I believe that either Cong's
races don't apply with have Vlad did things, or Cong will have to
implement the race fix slightly differently.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-02-15 12:38:38 -08:00
..
block s390/dasd: fix using offset into zero size array error 2019-01-28 15:43:17 +01:00
char s390/smp: fix CPU hotplug deadlock with CPU rescan 2019-01-11 17:12:02 +01:00
cio vfio-ccw update: 2018-12-13 10:44:18 +01:00
crypto s390/zcrypt: fix specification exception on z196 during ap probe 2019-01-28 15:43:17 +01:00
net s390/qeth: convert remaining legacy cmd callbacks 2019-02-12 13:14:24 -05:00
scsi scsi: zfcp: fix sysfs block queue limit output for max_segment_size 2019-01-29 01:14:59 -05:00
virtio virtio: don't allocate vqs when names[i] = NULL 2019-01-14 20:15:19 -05:00
Makefile kbuild: rename built-in.o to built-in.a 2018-03-26 02:01:19 +09:00