David S. Miller
c0b458a946
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:
1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE
2) In 'net-next' params->log_rq_size is renamed to be
params->log_rq_mtu_frames.
3) In 'net-next' params->hard_mtu is added.
Signed-off-by: David S. Miller <[email protected] >
2018-04-01 19:49:34 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2017-02-16 21:25:49 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xfrm: use IS_ENABLED() instead of checking for built-in or module
2016-09-10 21:19:11 -07:00
xfrm: Register xfrm_dev_notifier in appropriate place
2018-03-30 10:59:23 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-01 19:49:34 -04:00
net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms()
2018-03-13 07:46:37 +01:00
xfrm: fix rcu_read_unlock usage in xfrm_local_error
2018-03-16 08:26:02 +01:00
xfrm: Register xfrm_dev_notifier in appropriate place
2018-03-30 10:59:23 -04:00
net: Use octal not symbolic permissions
2018-03-26 12:07:48 -04:00
xfrm: Fix ESN sequence number handling for IPsec GSO packets.
2018-03-01 08:14:50 +01:00
xfrm: Refuse to insert 32 bit userspace socket policies on 64 bit systems
2018-02-02 09:23:23 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: Drop pernet_operations::async
2018-03-27 13:18:09 -04:00
c0b458a946