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-04-11 10:28:38 -07:00
2018-04-10 09:58:58 -04:00
2018-04-06 18:31:06 -07:00
2018-04-11 10:28:39 -07:00
2018-04-11 16:02:18 -07:00
2018-04-15 12:27:58 -07:00
2018-05-11 13:35:46 -04:00
2018-05-14 19:11:45 -07:00
2018-04-11 10:28:38 -07:00