David S. Miller 99d5ceeea5 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ... Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2017-02-16 1) Make struct xfrm_input_afinfo const, nothing writes to it. From Florian Westphal. 2) Remove all places that write to the afinfo policy backend and make the struct const then. From Florian Westphal. 3) Prepare for packet consuming gro callbacks and add ESP GRO handlers. ESP packets can be decapsulated at the GRO layer then. It saves a round through the stack for each ESP packet. Please note that this has a merge coflict between commit 63fca65d08 ("net: add confirm_neigh method to dst_ops") from net-next and 3d7d25a68e ("xfrm: policy: remove garbage_collect callback") a2817d8b27 ("xfrm: policy: remove family field") from ipsec-next. The conflict can be solved as it is done in linux-next. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-16 21:25:49 -05:00
..
datagram.c	udp: properly cope with csum errors	2017-02-07 11:19:00 -05:00
dev.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2017-02-16 21:25:49 -05:00
dev_addr_lists.c
dev_ioctl.c
devlink.c	devlink: allow to fillup eswitch attrs even if mode_get op does not exist	2017-02-10 14:43:00 -05:00
drop_monitor.c
dst.c	net: pending_confirm is not used anymore	2017-02-07 13:07:47 -05:00
dst_cache.c
ethtool.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-07 16:29:30 -05:00
fib_rules.c
filter.c
flow.c
flow_dissector.c
gen_estimator.c
gen_stats.c
gro_cells.c	gro_cells: move to net/core/gro_cells.c	2017-02-08 14:38:18 -05:00
hwbm.c
link_watch.c
lwt_bpf.c
lwtunnel.c
Makefile	gro_cells: move to net/core/gro_cells.c	2017-02-08 14:38:18 -05:00
neighbour.c	net: neigh: Fix netevent NETEVENT_DELAY_PROBE_TIME_UPDATE notification	2017-02-15 12:38:43 -05:00
net-procfs.c
net-sysfs.c
net-sysfs.h
net-traces.c
net_namespace.c
netclassid_cgroup.c
netevent.c
netpoll.c
netprio_cgroup.c	net: cgroups: fix build errors when linux/phy*.h is removed from net/dsa.h	2017-02-10 13:51:01 -05:00
pktgen.c
ptp_classifier.c
request_sock.c
rtnetlink.c
scm.c
secure_seq.c
skbuff.c
sock.c	sock: add sk_dst_pending_confirm flag	2017-02-07 13:07:46 -05:00
sock_diag.c
sock_reuseport.c
stream.c
sysctl_net_core.c
timestamping.c
tso.c
utils.c