]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b09179 50bd870)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Fri, 26 Jan 2018 15:22:53 +0000 (10:22 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Jan 2018 15:22:53 +0000 (10:22 -0500)
Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2018-01-26

One last patch for this development cycle:

1) Add ESN support for IPSec HW offload.
   From Yossef Efraim.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
include/linux/netdevice.h patch | diff1 | diff2 | blob | history
net/xfrm/xfrm_device.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/netdevice.h
Simple merge
diff --cc net/xfrm/xfrm_device.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.