linux-next

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 07:50:04 +00:00

History

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

apparmor

+ Features

2018-04-13 15:38:53 -07:00

integrity

ima: Fallback to the builtin hash algorithm

2018-03-25 07:26:32 -04:00

keys

headers: untangle kmemleak.h from mm.h

2018-04-05 21:36:27 -07:00

loadpin

get rid of pointless includes of fs_struct.h