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
..
2017-12-22 19:39:09 +11:00
2018-04-07 12:08:19 -07:00
2017-12-01 13:09:40 -08:00
2017-12-01 13:09:40 -08:00
2017-12-01 13:09:40 -08:00
2018-02-06 18:32:44 -08:00
2014-04-30 19:49:37 +01:00
2018-02-06 18:32:44 -08:00
2017-10-07 10:45:14 -06:00
2017-02-24 17:46:57 -08:00
2018-02-26 14:39:30 -05:00
2018-03-21 17:18:34 -05:00
2018-02-06 18:32:47 -08:00
2018-03-27 11:15:42 +02:00
2018-05-01 10:22:41 -04:00
2018-04-12 09:41:19 -07:00
2017-12-01 13:09:40 -08:00
2018-04-11 10:28:35 -07:00
2017-12-01 13:09:40 -08:00
2016-12-06 10:17:03 +02:00
2017-12-01 13:09:40 -08:00
2017-08-15 09:02:07 -07:00