linux/drivers/s390
David S. Miller 36583eb54d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/cadence/macb.c
	drivers/net/phy/phy.c
	include/linux/skbuff.h
	net/ipv4/tcp.c
	net/switchdev/switchdev.c

Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.

phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.

tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.

macb.c involved the addition of two zyncq device entries.

skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-23 01:22:35 -04:00
..
block s390/dasd: Fix unresumed device after suspend/resume having no paths 2015-04-15 12:23:51 +02:00
char s390/3215: free memory in error path 2015-04-23 16:55:50 +02:00
cio s390: remove use of seq_printf return value 2015-04-15 16:35:25 -07:00
crypto s390/zcrypt: Fix invalid domain handling during ap module unload 2015-05-13 09:57:29 +02:00
kvm virtio_ccw: support non-legacy balloon devices 2015-04-15 12:41:11 +09:30
net s390/lcs: Fix null-pointer access in msg 2015-05-18 12:14:18 -04:00
scsi mm, mempool: do not allow atomic resizing 2015-04-14 16:49:06 -07:00
Makefile