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
..
2018-03-28 14:30:41 +10:00
2017-03-28 16:16:52 +02:00
2018-05-03 01:17:44 +09:00
2017-11-17 17:45:29 -08:00
2018-04-03 15:51:22 -07:00
2018-03-26 02:01:18 +09:00
2018-02-02 00:21:47 +09:00
2018-04-04 16:01:43 -07:00
2017-11-17 17:45:29 -08:00
2017-11-14 18:25:40 -08:00
2017-11-17 17:45:29 -08:00
2018-02-06 18:32:47 -08:00
2017-11-17 17:45:29 -08:00
2017-11-17 17:45:29 -08:00
2018-04-04 16:43:47 -07:00
2014-08-20 16:03:45 +02:00