David S. Miller a658a3f2ec 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 2019-04-30 1) A lot of work to remove indirections from the xfrm code. From Florian Westphal. 2) Support ESP offload in combination with gso partial. From Boris Pismenny. 3) Remove some duplicated code from vti4. From Jeremy Sowden. Please note that there is merge conflict between commit: 8742dc86d0 ("xfrm4: Fix uninitialized memory read in _decode_session4") from the ipsec tree and commit: c53ac41e37 ("xfrm: remove decode_session indirection from afinfo_policy") from the ipsec-next tree. The merge conflict will appear when those trees get merged during the merge window. The conflict can be solved as it is done in linux-next: https://lkml.org/lkml/2019/4/25/1207 Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-30 09:26:13 -04:00
..
accounting
arch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-04-11 17:00:05 -07:00
bpf	bpf: Support BPF_MAP_TYPE_SK_STORAGE in bpf map probing	2019-04-27 09:07:05 -07:00
build	perf cs-etm: Add missing case value	2019-03-28 14:31:55 -03:00
cgroup
crypto
debugging
firewire
firmware	tools/firmware/ihex2fw: Replace explicit alignment with ALIGN	2019-01-22 10:23:18 +01:00
gpio
hv
iio	Merge 5.0-rc6 into staging-next	2019-02-11 09:25:01 +01:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-04-28 08:42:41 -04:00
io_uring	tools/io_uring: remove IOCQE_FLAG_CACHEHIT	2019-04-08 10:48:50 -06:00
kvm/kvm_stat
laptop
leds
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-04-28 08:42:41 -04:00
memory-model	tools/memory-model: Make scripts take "-j" abbreviation for "--jobs"	2019-01-21 11:07:04 +01:00
nfsd
objtool	objtool: Add rewind_stack_do_exit() to the noreturn list	2019-04-05 13:30:51 +02:00
pci
pcmcia
perf	perf bpf: Return NULL when RB tree lookup fails in perf_env__find_btf()	2019-04-17 14:30:23 -03:00
power	Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2019-03-30 01:41:22 +01:00
scripts
spi
testing	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2019-04-30 09:26:13 -04:00
thermal/tmon
time
usb
virtio
vm	tools/vm/slabinfo: clean up usage menu debug items	2019-03-05 21:07:20 -08:00
wmi
Makefile