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
..
acpi	More ACPI updates for v4.10-rc1	2016-12-22 10:19:32 -08:00
asm-generic	modversions: treat symbol CRCs as 32 bit quantities	2017-02-03 08:28:25 -08:00
clocksource
crypto	This pull contains one set of changes: a conversion of the crypto DocBook	2016-12-17 16:00:34 -08:00
drm	drm: Don't race connector registration	2017-01-30 10:17:32 +01:00
dt-bindings	net: phy: Add LED mode driver for Microsemi PHYs.	2017-02-08 13:29:04 -05:00
keys
kvm	KVM: arm64: Access CNTHCTL_EL2 bit fields correctly on VHE systems	2017-01-13 11:19:25 +00:00
linux	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2017-02-16 21:25:49 -05:00
math-emu
media
memory
misc
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2017-02-16 21:25:49 -05:00
pcmcia
ras
rdma	net-next: treewide use is_vlan_dev() helper function.	2017-02-06 16:33:29 -05:00
rxrpc
scsi	Merge remote-tracking branch 'mkp-scsi/fixes' into fixes	2017-01-17 17:32:54 -05:00
soc	ARCv2: MCIP: update the BCR per current changes	2017-01-24 11:05:59 -08:00
sound	Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/dpcm', 'asoc/fix/dwc', 'asoc/fix/fsl-ssi' and 'asoc/fix/hdmi-codec' into asoc-linus	2017-01-10 10:47:50 +00:00
target	target: Fix multi-session dynamic se_node_acl double free OOPs	2017-02-08 08:25:23 -08:00
trace	trace: rename trace_print_hex_seq arg and add kdoc	2017-02-03 15:50:18 -05:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-16 19:34:01 -05:00
video
xen	xen: features and fixes for 4.10 rc0	2016-12-13 16:07:55 -08:00
Kbuild